am 173a25f6: Merge change I0d74deb6 into eclair

Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
This commit is contained in:
Romain Guy
2009-10-15 15:42:05 -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);
}