From 258029eeaaace45fab6244cd09cc389aa57fedac Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Sun, 22 Apr 2012 17:17:01 -0400 Subject: Fix potential NPE when saving fragment state. If a fragment's saved view state is null and the user visible hint is true then the `result` bundle will have never been initialized to a value resulting in a `NullPointerException`. Mirrors support library change I8ba585bc6b9298841490d64bc22a8219cd261adb. Change-Id: Iabd5ac293d2ece3771da9ef257479eca0dcd523c --- core/java/android/app/FragmentManager.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/java/android/app/FragmentManager.java') diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 1abb7dea9949..0519d3ebf1b5 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); } -- cgit v1.2.3