Merge "Fix potential NPE when saving fragment state."

Dianne Hackborn · android code review · commit 3c40675f6f47 · 2012-04-23T19:00:48.000-07:00
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
@@ -1538,6 +1538,9 @@ Bundle saveFragmentBasicState(Fragment f) {
                     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);
         }

Original file line number	Diff line number	Diff line change
`@@ -1538,6 +1538,9 @@ Bundle saveFragmentBasicState(Fragment f) {`
`1538`	`1538`	`FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState);`
`1539`	`1539`	`}`
`1540`	`1540`	`if (!f.mUserVisibleHint) {`
	`1541`	`+ if (result == null) {`
	`1542`	`+ result = new Bundle();`
	`1543`	`+ }`
`1541`	`1544`	`// Only add this if it's not the default value`
`1542`	`1545`	`result.putBoolean(FragmentManagerImpl.USER_VISIBLE_HINT_TAG, f.mUserVisibleHint);`
`1543`	`1546`	`}`