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

Commit 38b41125 authored by Ben Lin's avatar Ben Lin
Browse files

Guarding against RecoverableSecurityException in N. 

Change-Id: Ibe1d8084d4993bc267ad474b7c8180469d033c4e
parent f8f06e94

src/com/android/documentsui/dirlist/Message.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ abstract class Message { 
        }

        }





        private void updateToRecoverableExceptionHeader(Update event) {

        private void updateToRecoverableExceptionHeader(Update event) {

            assert(Shared.ENABLE_OMC_API_FEATURES);

            RootInfo root = mEnv.getDisplayState().stack.getRoot();

            RootInfo root = mEnv.getDisplayState().stack.getRoot();

            update(mEnv.getContext().getResources().getText(R.string.authentication_required),

            update(mEnv.getContext().getResources().getText(R.string.authentication_required),

                    mEnv.getContext().getString(R.string.open_app, root.title),

                    mEnv.getContext().getString(R.string.open_app, root.title),

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.documentsui.DirectoryResult; 
import com.android.documentsui.archives.ArchivesProvider;

import com.android.documentsui.archives.ArchivesProvider;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.EventListener;

import com.android.documentsui.base.EventListener;

import com.android.documentsui.base.Shared;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.selection.Selection;

import com.android.documentsui.selection.Selection;
@@ -326,7 +327,8 @@ public class Model { 
        }

        }





        public boolean hasRecoverableException() {

        public boolean hasRecoverableException() {

            return hasException() && mException instanceof RecoverableSecurityException;

            return Shared.ENABLE_OMC_API_FEATURES && hasException()

                    && mException instanceof RecoverableSecurityException;

        }

        }





        public @Nullable Exception getException() {

        public @Nullable Exception getException() {