commit 38b411250fc20004e524c7ea8e651edecff499b0
author Ben Lin <linben@google.com> Fri Feb 03 17:52:43 2017 -0800
committer Ben Lin <linben@google.com> Mon Feb 06 17:37:47 2017 -0800
tree 5d17f17be051e14756f15a73a146cee2052ef935
parent f8f06e946bd8d3965b2ea96f83d5e46575193f05

Guarding against RecoverableSecurityException in N.

Change-Id: Ibe1d8084d4993bc267ad474b7c8180469d033c4e

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

diff --git a/src/com/android/documentsui/dirlist/Message.java b/src/com/android/documentsui/dirlist/Message.java
index e1e8b0c..7f9c6aa 100644
--- a/src/com/android/documentsui/dirlist/Message.java
+++ b/src/com/android/documentsui/dirlist/Message.java
@@ -115,6 +115,7 @@
         }
 
         private void updateToRecoverableExceptionHeader(Update event) {
+            assert(Shared.ENABLE_OMC_API_FEATURES);
             RootInfo root = mEnv.getDisplayState().stack.getRoot();
             update(mEnv.getContext().getResources().getText(R.string.authentication_required),
                     mEnv.getContext().getString(R.string.open_app, root.title),

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

diff --git a/src/com/android/documentsui/dirlist/Model.java b/src/com/android/documentsui/dirlist/Model.java
index 7a76098..199b060 100644
--- a/src/com/android/documentsui/dirlist/Model.java
+++ b/src/com/android/documentsui/dirlist/Model.java
@@ -38,6 +38,7 @@
 import com.android.documentsui.archives.ArchivesProvider;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.EventListener;
+import com.android.documentsui.base.Shared;
 import com.android.documentsui.roots.RootCursorWrapper;
 import com.android.documentsui.selection.Selection;
 
@@ -326,7 +327,8 @@
         }
 
         public boolean hasRecoverableException() {
-            return hasException() && mException instanceof RecoverableSecurityException;
+            return Shared.ENABLE_OMC_API_FEATURES && hasException()
+                    && mException instanceof RecoverableSecurityException;
         }
 
         public @Nullable Exception getException() {