commit 4911b783aa9f4af5ac919db861751d350471f5ef
author Dianne Hackborn <hackbod@google.com> Thu Jul 15 12:54:39 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Jul 15 14:43:13 2010 -0700
tree d535839b7dba0ee3d91ca7b72c644270efc3a1a9
parent 506821b406181ff9b9a10c2fc078d16b79a8cf92

Fix bug where loader listener would be registered twice.

Also change LoaderManager to an interface.

Change-Id: Ife6d123e56cc6f63b6fe902afac35b2673761e60

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 91e4cd5..1cdd423 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -651,7 +651,7 @@
         Object activity;
         HashMap<String, Object> children;
         ArrayList<Fragment> fragments;
-        SparseArray<LoaderManager> loaders;
+        SparseArray<LoaderManagerImpl> loaders;
     }
     /* package */ NonConfigurationInstances mLastNonConfigurationInstances;
     
@@ -669,8 +669,8 @@
 
     final FragmentManager mFragments = new FragmentManager();
     
-    SparseArray<LoaderManager> mAllLoaderManagers;
-    LoaderManager mLoaderManager;
+    SparseArray<LoaderManagerImpl> mAllLoaderManagers;
+    LoaderManagerImpl mLoaderManager;
     
     private static final class ManagedCursor {
         ManagedCursor(Cursor cursor) {
@@ -779,13 +779,13 @@
         return mLoaderManager;
     }
     
-    LoaderManager getLoaderManager(int index, boolean started) {
+    LoaderManagerImpl getLoaderManager(int index, boolean started) {
         if (mAllLoaderManagers == null) {
-            mAllLoaderManagers = new SparseArray<LoaderManager>();
+            mAllLoaderManagers = new SparseArray<LoaderManagerImpl>();
         }
-        LoaderManager lm = mAllLoaderManagers.get(index);
+        LoaderManagerImpl lm = mAllLoaderManagers.get(index);
         if (lm == null) {
-            lm = new LoaderManager(started);
+            lm = new LoaderManagerImpl(started);
             mAllLoaderManagers.put(index, lm);
         }
         return lm;
@@ -1554,7 +1554,7 @@
             // prune out any loader managers that were already stopped, so
             // have nothing useful to retain.
             for (int i=mAllLoaderManagers.size()-1; i>=0; i--) {
-                LoaderManager lm = mAllLoaderManagers.valueAt(i);
+                LoaderManagerImpl lm = mAllLoaderManagers.valueAt(i);
                 if (lm.mRetaining) {
                     retainLoaders = true;
                 } else {