From a8a720d8cd208d7d265de28ab69f7e68eb10140a Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Thu, 15 Oct 2009 15:09:26 -0700
Subject: Fix possible NPE in the code that restores widgets' state.

Bug #2189714
Reviewed by: ryanpc

Change-Id: I0d74deb6dc8e90e3b0eafd6b3c16b0c557c72873
---
 core/java/android/appwidget/AppWidgetHostView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index a4c141e..bb0cbe9 100644
--- 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);
     }
 
-- 
cgit v1.1