commit 9e14e9f33a66b864b98c6ff9517988bafbca3301
author Dianne Hackborn <hackbod@google.com> Wed Jul 14 11:07:38 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Wed Jul 14 12:14:24 2010 -0700
tree 3c634d37e7658101b11b43058064188bca732646
parent 26dd7b3bb381ba06ce3a7eb17205e54fdd7becfc

Fix fragment index expunging.

Change-Id: If37e58dfa998575530305584d3aa756bb5a61d7b

core/java/android/app/Activity.java

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 @@
         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()}

core/java/android/app/FragmentManager.java

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 @@
                             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 @@
             mAvailIndices = new ArrayList<Integer>();
         }
         mAvailIndices.add(f.mIndex);
+        mActivity.invalidateFragmentIndex(f.mIndex);
         f.clearIndex();
     }