commit d04ad541def2bca8fc2d810514ee15ab97893d35
author Dianne Hackborn <hackbod@google.com> Mon Jul 25 16:16:15 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Mon Jul 25 16:28:47 2011 -0700
tree f4ef1bb692c8d5616ef1e25285ef219df72f742f
parent e3f5edf9755ca2ffbb654389251a61b35a3d9901

Fix issue #5063010: Loaders don't seem to be properly...

...retained with compatibility library

Yikes, and also in the main platform...! :(

Change-Id: I76ee3a9a5ba4a220c2f54d0af9cf49e3a736e7bd

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index aeb16f4..8d03ac7 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1593,10 +1593,10 @@
         //Log.v(TAG, "invalidateFragmentIndex: index=" + index);
         if (mAllLoaderManagers != null) {
             LoaderManagerImpl lm = mAllLoaderManagers.get(index);
-            if (lm != null) {
+            if (lm != null && !lm.mRetaining) {
                 lm.doDestroy();
+                mAllLoaderManagers.remove(index);
             }
-            mAllLoaderManagers.remove(index);
         }
     }