Merge change I0d74deb6 into eclair

* changes: Fix possible NPE in the code that restores widgets' state.
2009-10-15 18:33:12 -04:00
parent 9e58e6427c a8a720d8cd
commit 173a25f670
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@ -123,7 +123,8 @@ public class AppWidgetHostView extends FrameLayout {

    @Override
    protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
-        final ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId());
+        ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId());
+        if (jail == null) jail = new ParcelableSparseArray();
        super.dispatchRestoreInstanceState(jail);
    }