commit de9d40d445eb7e095ef1f988bf24695da525c772
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 08 10:55:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 08 10:55:46 2012 -0700
tree 4fad935b5bdff5ce969a19becd0544d0d70f57d0
parent c98db2a7d1379eacef17029e03f1ff4532f32f0a
parent 64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80

am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"

* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
  Fix cursor memory leak

core/java/android/database/AbstractCursor.java

diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java
index fb04817..e7ff92d 100644
--- a/core/java/android/database/AbstractCursor.java
+++ b/core/java/android/database/AbstractCursor.java
@@ -424,6 +424,9 @@
         if (mSelfObserver != null && mSelfObserverRegistered == true) {
             mContentResolver.unregisterContentObserver(mSelfObserver);
         }
+        try {
+            if (!mClosed) close();
+        } catch(Exception e) { }
     }
 
     /**