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

Author: Adam Cohen

core/java/android/appwidget/AppWidgetHostView.java

@@ -226,7 +226,12 @@ protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
 
         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);
+        }
     }
 
     /**