Merge "bug:3497143 don't print warning if it is a bug in platform - not in app."

2 files changed, 5 insertions, 7 deletions

diff --git a/core/java/android/database/AbstractWindowedCursor.java b/core/java/android/database/AbstractWindowedCursor.java
index 8addaa8..3d95769 100644
--- a/core/java/android/database/AbstractWindowedCursor.java
+++ b/core/java/android/database/AbstractWindowedCursor.java
@@ -117,7 +117,8 @@ public abstract class AbstractWindowedCursor extends AbstractCursor {
         super.checkPosition();
         
         if (mWindow == null) {
-            throw new StaleDataException("Attempting to access a closed cursor");
+            throw new StaleDataException("Attempting to access a closed CursorWindow." +
+                    "Most probable cause: cursor is deactivated prior to calling this method.");
         }
     }
 
diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java
index bd78063..7a2d271 100644
--- a/core/java/android/database/CursorWindow.java
+++ b/core/java/android/database/CursorWindow.java
@@ -568,12 +568,9 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
         if (nWindow == 0) {
             return;
         }
-        if (StrictMode.vmSqliteObjectLeaksEnabled()) {
-            StrictMode.onSqliteObjectLeaked(
-                    "Releasing cursor in a finalizer. Please ensure " +
-                    "that you explicitly call close() on your cursor: ",
-                    mStackTrace);
-        }
+        // due to bugs 3329504, 3502276, cursorwindow sometimes is closed in fialize()
+        // don't print any warning saying "don't release cursor in finzlize"
+        // because it is a bug in framework code - NOT an app bug.
         recordClosingOfWindow(nWindow);
         close_native();
     }