am d77d17c2: Merge "Fix cursor memory leak"

* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700': Fix cursor memory leak
2012-08-08 10:54:04 -07:00
parent 425d13a0ae d77d17c28d
commit 64ed6b2cfa
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) { }
    }

    /**