am 49f8a0ee: am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair

Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95'

* commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95':
  Fix possible NPE in the code that restores widgets' state.
This commit is contained in:
Romain Guy
2009-10-15 19:23:49 -07:00
committed by Android Git Automerger

View File

@@ -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);
}