aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Refine widgets removal logging" into sc-dev

Browse Source
This commit is contained in:
Steven Ng
2021-06-26 22:37:35 +00:00
committed by Android (Google) Code Review
parent 24c8ebd88d acd9d79932
commit 57072af106
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/Launcher.java
View File

@@ -2330,30 +2330,32 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
try {
final LauncherAppWidgetProviderInfo appWidgetInfo;
String reason = "";
String removalReason = "";
if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY)) {
// If the provider is not ready, bind as a pending widget.
appWidgetInfo = null;
reason = "the provider not ready.";
removalReason = "the provider isn't ready.";
} else if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_ID_NOT_VALID)) {
// The widget id is not valid. Try to find the widget based on the provider info.
appWidgetInfo = mAppWidgetManager.findProvider(item.providerName, item.user);
if (appWidgetInfo == null) {
if (WidgetsModel.GO_DISABLE_WIDGETS) {
reason = "widgets are disabled on go device.";
removalReason = "widgets are disabled on go device.";
} else {
reason = "WidgetManagerHelper cannot find a provider from provider info.";
removalReason =
"WidgetManagerHelper cannot find a provider from provider info.";
}
}
} else {
appWidgetInfo = mAppWidgetManager.getLauncherAppWidgetInfo(item.appWidgetId);
if (appWidgetInfo == null) {
if (item.appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
reason = "CustomWidgetManager cannot find provider from that widget id .";
removalReason =
"CustomWidgetManager cannot find provider from that widget id.";
} else {
reason = "AppWidgetManager cannot find provider for that widget id."
+ " It could be due to AppWidgetService is not available, or the"
removalReason = "AppWidgetManager cannot find provider for that widget id."
+ " It could be because AppWidgetService is not available, or the"
+ " appWidgetId has not been bound to a the provider yet, or you"
+ " don't have access to that appWidgetId.";
}
@@ -2366,7 +2368,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
if (appWidgetInfo == null) {
FileLog.d(TAG, "Removing restored widget: id=" + item.appWidgetId
+ " belongs to component " + item.providerName + " user " + item.user
+ ", as the provider is null and " + reason);
+ ", as the provider is null and " + removalReason);
getModelWriter().deleteItemFromDatabase(item);
return null;
}