summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-08-08 09:53:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-08 09:53:23 -0700
commite112567b45550e50586002d75bf540763ad21fb9 (patch)
treec6b9936b9ebc99c4b6a45e64b72556055bcdebdb /core/java/android/app
parentc993acbce63b60385b01cf1b95a4799ec308339b (diff)
parent9520251003cc3a321028bb80693749e5047eb3f8 (diff)
downloadframeworks_base-e112567b45550e50586002d75bf540763ad21fb9.zip
frameworks_base-e112567b45550e50586002d75bf540763ad21fb9.tar.gz
frameworks_base-e112567b45550e50586002d75bf540763ad21fb9.tar.bz2
Merge "Fix bug 5116342 - don't keep fragment state around once resumed"
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/FragmentManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 712b55f..70e6866 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -829,6 +829,9 @@ final class FragmentManagerImpl extends FragmentManager {
throw new SuperNotCalledException("Fragment " + f
+ " did not call through to super.onResume()");
}
+ // Get rid of this in case we saved it and never needed it.
+ f.mSavedFragmentState = null;
+ f.mSavedViewState = null;
}
}
} else if (f.mState > newState) {