diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-06-09 01:53:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 01:53:36 +0000 |
commit | ece9f02da50ca0f7613dd20a8849ff7c85c1b920 (patch) | |
tree | dc91aca16b2cf953b935deeac63ae9b06dc7a805 /src | |
parent | 3114425140152c2fd7e90ca4a000482d19f28e74 (diff) | |
parent | 3abd5488cca5b06c97251db453a5a6ed61e33ce8 (diff) | |
download | android_packages_apps_Trebuchet-ece9f02da50ca0f7613dd20a8849ff7c85c1b920.tar.gz android_packages_apps_Trebuchet-ece9f02da50ca0f7613dd20a8849ff7c85c1b920.tar.bz2 android_packages_apps_Trebuchet-ece9f02da50ca0f7613dd20a8849ff7c85c1b920.zip |
Merge "Catch TransactionTooLargeException when loading widget provider list b/19904873" into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 10b8648de..a132e919a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -45,6 +45,7 @@ import android.os.Parcelable; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; +import android.os.TransactionTooLargeException; import android.provider.BaseColumns; import android.text.TextUtils; import android.util.Log; @@ -3284,27 +3285,51 @@ public class LauncherModel extends BroadcastReceiver public static List<LauncherAppWidgetProviderInfo> getWidgetProviders(Context context, boolean refresh) { - synchronized (sBgLock) { - if (sBgWidgetProviders == null || refresh) { - sBgWidgetProviders = new HashMap<>(); - AppWidgetManagerCompat wm = AppWidgetManagerCompat.getInstance(context); - LauncherAppWidgetProviderInfo info; - - List<AppWidgetProviderInfo> widgets = wm.getAllProviders(); - for (AppWidgetProviderInfo pInfo : widgets) { - info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo); - UserHandleCompat user = wm.getUser(info); - sBgWidgetProviders.put(new ComponentKey(info.provider, user), info); - } - - Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values(); - for (CustomAppWidget widget : customWidgets) { - info = new LauncherAppWidgetProviderInfo(context, widget); - UserHandleCompat user = wm.getUser(info); - sBgWidgetProviders.put(new ComponentKey(info.provider, user), info); + ArrayList<LauncherAppWidgetProviderInfo> results = + new ArrayList<LauncherAppWidgetProviderInfo>(); + try { + synchronized (sBgLock) { + if (sBgWidgetProviders == null || refresh) { + HashMap<ComponentKey, LauncherAppWidgetProviderInfo> tmpWidgetProviders + = new HashMap<>(); + AppWidgetManagerCompat wm = AppWidgetManagerCompat.getInstance(context); + LauncherAppWidgetProviderInfo info; + + List<AppWidgetProviderInfo> widgets = wm.getAllProviders(); + for (AppWidgetProviderInfo pInfo : widgets) { + info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo); + UserHandleCompat user = wm.getUser(info); + tmpWidgetProviders.put(new ComponentKey(info.provider, user), info); + } + + Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values(); + for (CustomAppWidget widget : customWidgets) { + info = new LauncherAppWidgetProviderInfo(context, widget); + UserHandleCompat user = wm.getUser(info); + tmpWidgetProviders.put(new ComponentKey(info.provider, user), info); + } + // Replace the global list at the very end, so that if there is an exception, + // previously loaded provider list is used. + sBgWidgetProviders = tmpWidgetProviders; + } + results.addAll(sBgWidgetProviders.values()); + return results; + } + } catch (Exception e) { + if (e.getCause() instanceof TransactionTooLargeException) { + // the returned value may be incomplete and will not be refreshed until the next + // time Launcher starts. + // TODO: after figuring out a repro step, introduce a dirty bit to check when + // onResume is called to refresh the widget provider list. + synchronized (sBgLock) { + if (sBgWidgetProviders != null) { + results.addAll(sBgWidgetProviders.values()); + } + return results; } + } else { + throw e; } - return new ArrayList<LauncherAppWidgetProviderInfo>(sBgWidgetProviders.values()); } } |