diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-04-23 21:44:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-23 21:44:43 -0700 |
| commit | 847d677f348cfe8dfca8b976dc1fbc40a865d4c9 (patch) | |
| tree | 4fe92968b66c33836d0dbaf4ddb8916360a6406c /core/java/android | |
| parent | 22ec624c33dd6819293cb1444b9034d0212a9768 (diff) | |
| parent | 3c40675f6f473896b93ca6416d29192d88e92622 (diff) | |
| download | frameworks_base-847d677f348cfe8dfca8b976dc1fbc40a865d4c9.zip frameworks_base-847d677f348cfe8dfca8b976dc1fbc40a865d4c9.tar.gz frameworks_base-847d677f348cfe8dfca8b976dc1fbc40a865d4c9.tar.bz2 | |
am 3c40675f: Merge "Fix potential NPE when saving fragment state."
* commit '3c40675f6f473896b93ca6416d29192d88e92622':
Fix potential NPE when saving fragment state.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 1abb7de..0519d3e 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1538,6 +1538,9 @@ final class FragmentManagerImpl extends FragmentManager { FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState); } if (!f.mUserVisibleHint) { + if (result == null) { + result = new Bundle(); + } // Only add this if it's not the default value result.putBoolean(FragmentManagerImpl.USER_VISIBLE_HINT_TAG, f.mUserVisibleHint); } |