diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-04-24 15:54:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-24 15:54:56 -0700 |
| commit | a057f332fb30fb0a858e32dc63eba1763e7bfa92 (patch) | |
| tree | 20538bbb323bc532dbda6794f8ff50a3e1e9916f /core/java/android | |
| parent | 2ed9c20048d9aed5ce758635eaa109ebb18f0d24 (diff) | |
| parent | 5ba15cc38f11ffcfa5dbc65e4c213272b458d99c (diff) | |
| download | frameworks_base-a057f332fb30fb0a858e32dc63eba1763e7bfa92.zip frameworks_base-a057f332fb30fb0a858e32dc63eba1763e7bfa92.tar.gz frameworks_base-a057f332fb30fb0a858e32dc63eba1763e7bfa92.tar.bz2 | |
am 5ba15cc3: am 9d9251c8: am 847d677f: am 3c40675f: Merge "Fix potential NPE when saving fragment state."
* commit '5ba15cc38f11ffcfa5dbc65e4c213272b458d99c':
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); } |