summaryrefslogtreecommitdiffstats
path: root/core/java/android/database
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 10:44:50 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-08 10:44:50 -0700
commitd77d17c28d6f120ceb648747c7e2ef1a50215700 (patch)
treece76d506472a8a546a5442bc5c6a18d6d568f2ed /core/java/android/database
parent2278e60c39f937b6eee14fbf0094d4be92d7f06b (diff)
parent3f824c0e72ad8cde2dc9b0f4d4d7b621b5535e62 (diff)
downloadframeworks_base-d77d17c28d6f120ceb648747c7e2ef1a50215700.zip
frameworks_base-d77d17c28d6f120ceb648747c7e2ef1a50215700.tar.gz
frameworks_base-d77d17c28d6f120ceb648747c7e2ef1a50215700.tar.bz2
Merge "Fix cursor memory leak"
Diffstat (limited to 'core/java/android/database')
-rw-r--r--core/java/android/database/AbstractCursor.java3
1 files changed, 3 insertions, 0 deletions
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 @@ public abstract class AbstractCursor implements CrossProcessCursor {
if (mSelfObserver != null && mSelfObserverRegistered == true) {
mContentResolver.unregisterContentObserver(mSelfObserver);
}
+ try {
+ if (!mClosed) close();
+ } catch(Exception e) { }
}
/**