Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp

* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
  Fix possible NPE in the code that restores widgets' state.
This commit is contained in:
Romain Guy
2009-10-15 19:13:51 -07:00
committed by Android Git Automerger
parent f6411533ef 7d4134a1a6
commit 49f8a0ee91
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/appwidget/AppWidgetHostView.java
View File

@@ -123,7 +123,8 @@ public class AppWidgetHostView extends FrameLayout {
@Override @Override
protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) { 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); super.dispatchRestoreInstanceState(jail);
} }