summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-06-08 18:41:04 -0700
committerHyunyoung Song <hyunyoungs@google.com>2015-06-09 19:06:29 +0000
commit0c979d1f2fda45b9d098f9399e1079e6bc22c2b0 (patch)
tree26a418e2ae2b841958534dbec5a5293fbb29fb49
parenta14cb230dad35fc4ad54dae9f5c5d4f71b89ff12 (diff)
downloadandroid_packages_apps_Trebuchet-0c979d1f2fda45b9d098f9399e1079e6bc22c2b0.tar.gz
android_packages_apps_Trebuchet-0c979d1f2fda45b9d098f9399e1079e6bc22c2b0.tar.bz2
android_packages_apps_Trebuchet-0c979d1f2fda45b9d098f9399e1079e6bc22c2b0.zip
Catch TransactionTooLargeException when loading widget provider list
b/19904873 Change-Id: Ic0d13ee7513731706bc0f9fde8502acba0899cb3 Note: fix for almonte will be separate due to diff btw the branches.. (cherry picked from commit 3abd5488cca5b06c97251db453a5a6ed61e33ce8)
-rw-r--r--src/com/android/launcher3/LauncherModel.java59
1 files changed, 42 insertions, 17 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 2e5d4e9b3..ee35457b7 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -47,6 +47,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;
@@ -3338,27 +3339,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;
+ 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);
+ }
- 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);
+ 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;
}
-
- 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);
+ 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());
}
}