am 64ed6b2: am d77d17c: Merge "Fix cursor memory leak"

Jean-Baptiste Queru · Android Git Automerger · commit de9d40d445eb · 2012-08-08T10:55:46.000-07:00
* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
  Fix cursor memory leak
diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java
@@ -424,6 +424,9 @@ protected void finalize() {
         if (mSelfObserver != null && mSelfObserverRegistered == true) {
             mContentResolver.unregisterContentObserver(mSelfObserver);
         }
+        try {
+            if (!mClosed) close();
+        } catch(Exception e) { }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,9 @@ protected void finalize() {`
`424`	`424`	`if (mSelfObserver != null && mSelfObserverRegistered == true) {`
`425`	`425`	`mContentResolver.unregisterContentObserver(mSelfObserver);`
`426`	`426`	`}`
	`427`	`+ try {`
	`428`	`+ if (!mClosed) close();`
	`429`	`+ } catch(Exception e) { }`
`427`	`430`	`}`
`428`	`431`
`429`	`432`	`/**`