diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-14 12:17:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-14 12:17:24 -0700 |
| commit | 72c9265ac5a12004cf766e825983b7291ed0ef9e (patch) | |
| tree | 9767658b339da90ab99d974592c0cca6a087c721 /core/java | |
| parent | 756088482fb102f0c728151553210dca254b575f (diff) | |
| parent | 9e14e9f33a66b864b98c6ff9517988bafbca3301 (diff) | |
| download | frameworks_base-72c9265ac5a12004cf766e825983b7291ed0ef9e.zip frameworks_base-72c9265ac5a12004cf766e825983b7291ed0ef9e.tar.gz frameworks_base-72c9265ac5a12004cf766e825983b7291ed0ef9e.tar.bz2 | |
Merge "Fix fragment index expunging."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 20272df..a1cf233 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1567,6 +1567,12 @@ public class Activity extends ContextThemeWrapper return new BackStackEntry(mFragments); } + void invalidateFragmentIndex(int index) { + if (mAllLoaderManagers != null) { + mAllLoaderManagers.remove(index); + } + } + /** * Called when a Fragment is being attached to this activity, immediately * after the call to its {@link Fragment#onAttach Fragment.onAttach()} diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 50307d4..4f3043c 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -316,7 +316,6 @@ public class FragmentManager { throw new SuperNotCalledException("Fragment " + f + " did not call through to super.onDetach()"); } - f.mActivity.mAllLoaderManagers.remove(f.mIndex); f.mActivity = null; } } @@ -377,6 +376,7 @@ public class FragmentManager { mAvailIndices = new ArrayList<Integer>(); } mAvailIndices.add(f.mIndex); + mActivity.invalidateFragmentIndex(f.mIndex); f.clearIndex(); } |