Release resources for a previously loaded cursor if a new one

comes in.

Change-Id: I43b8788869d5bfdd06096de6cb23acdf26a1c19a

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/content/CursorLoader.java b/core/java/android/content/CursorLoader.java
index 01bf9686412a..850ff7f0cf2b 100644
--- a/core/java/android/content/CursorLoader.java
+++ b/core/java/android/content/CursorLoader.java
@@ -55,8 +55,13 @@ public class CursorLoader extends AsyncTaskLoader<Cursor> {
             }
             return;
         }
+        Cursor oldCursor = mCursor;
         mCursor = cursor;
         super.deliverResult(cursor);
+
+        if (oldCursor != null && !oldCursor.isClosed()) {
+            oldCursor.close();
+        }
     }
 
     public CursorLoader(Context context, Uri uri, String[] projection, String selection,