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

Commit b54a621e authored by Diksha Gohlyan's avatar Diksha Gohlyan
Browse files

Check if cursor is closed for staleDataException 

Test: atest DocumentsUIGoogleTests
Bug: 162292209

Change-Id: Ia4df46e4a1938bc421754763fa9d8ca12fde6280
(cherry picked from commit 56e7a5f9)
parent 4c23484b

src/com/android/documentsui/DirectoryLoader.java

+6 −6
Original line number Diff line number Diff line
@@ -314,20 +314,20 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
    }



    private boolean checkIfCursorStale(DirectoryResult result) {

        if (mResult == null) {

        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) {

            try {

                if (!cursor.moveToNext()) {

                    return true;

                }

            }

        } catch (Exception e) {

            return true;

        }

        }

        return false;

    }

}

src/com/android/documentsui/MultiRootDocumentsLoader.java

+6 −6
Original line number Diff line number Diff line
@@ -458,20 +458,20 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
    }



    private boolean checkIfCursorStale(DirectoryResult result) {

        if (mResult == null) {

        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) {

            try {

                if (!cursor.moveToNext()) {

                    return true;

                }

            }

        } catch (Exception e) {

            return true;

        }

        }

        return false;

    }

}