This may fix LoaderManager bug where a closed cursor could be used.

Change-Id: I362d5f86dcbdbede921ef9d29c849ed6401850ea
2010-08-09 16:32:52 -07:00
parent 02890fd0f9
commit debb2e25b3
1 changed files with 8 additions and 5 deletions
--- a/core/java/android/app/LoaderManager.java
+++ b/core/java/android/app/LoaderManager.java
@@ -185,11 +185,14 @@ class LoaderManagerImpl implements LoaderManager {
        void stop() {
            if (DEBUG) Log.v(TAG, "  Stopping: " + this);
            mStarted = false;
-            if (mLoader != null && mListenerRegistered) {
-                // Let the loader know we're done with it
-                mListenerRegistered = false;
-                mLoader.unregisterListener(this);
-                mLoader.stopLoading();
+            if (!mRetaining) {
+                if (mLoader != null && mListenerRegistered) {
+                    // Let the loader know we're done with it
+                    mListenerRegistered = false;
+                    mLoader.unregisterListener(this);
+                    mLoader.stopLoading();
+                }
+                mData = null;
            }
        }