commit 1cd40fff7a5e61c4bac244846aa3e6feedf94399
author Ben Lin <linben@google.com> Tue Feb 07 02:29:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 02:29:01 2017 +0000
tree 92bcaa269a5ab651370438af8a93f4967411122f
parent 5412e7fdf66fa5b05b3989566bfb5bcafbd04196
parent 38b411250fc20004e524c7ea8e651edecff499b0

Merge "Guarding against RecoverableSecurityException in N." into arc-apps

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 9ba8b5c..b427484 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;
 
@@ -336,7 +337,8 @@
         }
 
         public boolean hasRecoverableException() {
-            return hasException() && mException instanceof RecoverableSecurityException;
+            return Shared.ENABLE_OMC_API_FEATURES && hasException()
+                    && mException instanceof RecoverableSecurityException;
         }
 
         public @Nullable Exception getException() {