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

Commit fd73166b authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Check if cursor is closed for staleDataException" into rvc-qpr-dev am: 8af1a757 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/13238918

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic60c595f9efc3838f5b953e1c37b7c97634ca7b8
parents 9e613cdd 8af1a757

src/com/android/documentsui/DirectoryLoader.java

+21 −2
Original line number Diff line number Diff line
@@ -281,10 +281,11 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 


    @Override

    protected void onStartLoading() {

        if (mResult != null) {

        boolean isCursorStale = checkIfCursorStale(mResult);

        if (mResult != null && !isCursorStale) {

            deliverResult(mResult);

        }

        if (takeContentChanged() || mResult == null) {

        if (takeContentChanged() || mResult == null || isCursorStale) {

            forceLoad();

        }

    }
@@ -313,4 +314,22 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        FileUtils.closeQuietly(mResult);

        mResult = null;

    }



    private boolean checkIfCursorStale(DirectoryResult result) {

        if (result == null || result.cursor == null || result.cursor.isClosed()) {

            return true;

        }

        Cursor cursor = result.cursor;

        try {

            cursor.moveToPosition(-1);

            for (int pos = 0; pos < cursor.getCount(); ++pos) {

                if (!cursor.moveToNext()) {

                    return true;

                }

            }

        } catch (Exception e) {

            return true;

        }

        return false;

    }

}

src/com/android/documentsui/MultiRootDocumentsLoader.java

+21 −2
Original line number Diff line number Diff line
@@ -303,10 +303,11 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 


    @Override

    protected void onStartLoading() {

        if (mResult != null) {

        boolean isCursorStale = checkIfCursorStale(mResult);

        if (mResult != null && !isCursorStale) {

            deliverResult(mResult);

        }

        if (takeContentChanged() || mResult == null) {

        if (takeContentChanged() || mResult == null || isCursorStale) {

            forceLoad();

        }

    }
@@ -456,4 +457,22 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
            mIsClosed = true;

        }

    }



    private boolean checkIfCursorStale(DirectoryResult result) {

        if (result == null || result.cursor == null || result.cursor.isClosed()) {

            return true;

        }

        Cursor cursor = result.cursor;

        try {

            cursor.moveToPosition(-1);

            for (int pos = 0; pos < cursor.getCount(); ++pos) {

                if (!cursor.moveToNext()) {

                    return true;

                }

            }

        } catch (Exception e) {

            return true;

        }

        return false;

    }

}