From 6ccf4e279170ef7f7602d1e2a63e9a2ef98cd57f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 21 Sep 2012 16:09:34 -0700
Subject: Fixing onRestoreInstanceState crash in Launcher

-> Issue 7084152

Change-Id: Ic91074adfff5918e6471c861313a51d0a179ad08
---
 core/java/android/appwidget/AppWidgetHostView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/java/android/appwidget/AppWidgetHostView.java')

diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index c86826ff19ed..f258f17992ec 100644
--- 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);
+        }
     }
 
     /**
-- 
cgit v1.2.3