Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d97983 authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

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

parents c13c8d82 8a358a7e

core/java/android/database/AbstractWindowedCursor.java

+2 −1
Original line number Diff line number Diff line
@@ -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.");

        }

    }

core/java/android/database/CursorWindow.java

+3 −6
Original line number Diff line number Diff line
@@ -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();

    }