From ae8dd29c035fffa6e302bd485d0552f97db39127 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 5 Nov 2009 13:36:15 -0800 Subject: Prevent crash in Home when using widgets whose ids collide with Home's resources. Bug #2228943. Approved by mcleron, triaged by ryanpc. Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2 --- core/java/android/appwidget/AppWidgetHostView.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (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 bb0cbe9f7d6c..2f719f3c5bd7 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -123,8 +123,15 @@ public class AppWidgetHostView extends FrameLayout { @Override protected void dispatchRestoreInstanceState(SparseArray container) { - ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId()); + final Parcelable parcelable = container.get(generateId()); + + ParcelableSparseArray jail = null; + if (parcelable != null && parcelable instanceof ParcelableSparseArray) { + jail = (ParcelableSparseArray) parcelable; + } + if (jail == null) jail = new ParcelableSparseArray(); + super.dispatchRestoreInstanceState(jail); } @@ -140,7 +147,7 @@ public class AppWidgetHostView extends FrameLayout { /** * Process a set of {@link RemoteViews} coming in as an update from the - * AppWidget provider. Will animate into these new views as needed. + * AppWidget provider. Will animate into these new views as needed */ public void updateAppWidget(RemoteViews remoteViews) { if (LOGD) Log.d(TAG, "updateAppWidget called mOld=" + mOld); -- cgit v1.2.3