Merge "Fix cursor memory leak"

2012-08-08 10:44:50 -07:00
parent 2278e60c39 3f824c0e72
commit d77d17c28d
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/database/AbstractCursor.java
+++ b/core/java/android/database/AbstractCursor.java
@@ -424,6 +424,9 @@ public abstract class AbstractCursor implements CrossProcessCursor {
        if (mSelfObserver != null && mSelfObserverRegistered == true) {
            mContentResolver.unregisterContentObserver(mSelfObserver);
        }
+        try {
+            if (!mClosed) close();
+        } catch(Exception e) { }
    }

    /**