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

Commit cc6a8b51 authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. 

am: d91dd17f

Change-Id: Ia7400ff8e4ecfd903a6ff7f5158786d3fd8c1bff
parents 642941d6 d91dd17f

packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 
                    throw new RuntimeException(e);

                } catch (ExecutionException e) {

                    // We already logged on other side

                } catch (Exception e) {

                    Log.e(TAG, "Failed to query Recents for authority: " + task.authority

                        + ". Skip this authority in Recents.", e);

                }

            } else {

                allDone = false;

packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java

+7 −1
Original line number Diff line number Diff line
@@ -107,7 +107,13 @@ public class Model { 
        mSortOrder = result.sortOrder;

        doc = result.doc;



        try {

            updateModelData();

        } catch (Exception e) {

            Log.e(TAG, "Error while accessing cursors", e);

            notifyUpdateListeners(e);

            return;

        }



        final Bundle extras = mCursor.getExtras();

        if (extras != null) {