Merge "Release resources for a previously loaded cursor if a new one comes in."

2010-07-23 11:59:15 -07:00
parent 2ffb512a8a 8e6f69b08f
commit 851ec0eb2e
1 changed files with 5 additions and 0 deletions
--- 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,