diff options
| author | Adam Powell <adamp@google.com> | 2011-06-17 14:32:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 14:32:23 -0700 |
| commit | 09b8a55516f518dcf5df92f7ae470a7b921f70c0 (patch) | |
| tree | 39d2cc710daa1388b008dfad2795502c1a0e9bcc /core/java | |
| parent | 4f844e26366dac62c27fea0ccdd4db5b9c359e47 (diff) | |
| parent | f1a4549604639e3d9eafc406426ddc252d427b57 (diff) | |
| download | frameworks_base-09b8a55516f518dcf5df92f7ae470a7b921f70c0.zip frameworks_base-09b8a55516f518dcf5df92f7ae470a7b921f70c0.tar.gz frameworks_base-09b8a55516f518dcf5df92f7ae470a7b921f70c0.tar.bz2 | |
Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/view/menu/ListMenuPresenter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/menu/ListMenuPresenter.java b/core/java/com/android/internal/view/menu/ListMenuPresenter.java index f8d24a3..cc09927 100644 --- a/core/java/com/android/internal/view/menu/ListMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ListMenuPresenter.java @@ -177,7 +177,9 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick public void restoreHierarchyState(Bundle inState) { SparseArray<Parcelable> viewStates = inState.getSparseParcelableArray(VIEWS_TAG); - ((View) mMenuView).restoreHierarchyState(viewStates); + if (viewStates != null) { + ((View) mMenuView).restoreHierarchyState(viewStates); + } } private class MenuAdapter extends BaseAdapter { |