Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev

2012-09-21 17:11:37 -07:00
parent c9e94ea645 6ccf4e2791
commit 172cb76964
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@@ -226,7 +226,12 @@ public class AppWidgetHostView extends FrameLayout {

        if (jail == null) jail = new ParcelableSparseArray();

-        super.dispatchRestoreInstanceState(jail);
+        try  {
+            super.dispatchRestoreInstanceState(jail);
+        } catch (Exception e) {
+            Log.e(TAG, "failed to restoreInstanceState for widget id: " + mAppWidgetId + ", "
+                    + (mInfo == null ? "null" : mInfo.provider), e);
+        }
    }

    /**