commit 10a222bf3c35cc62ea5062987814fc60c93b16d8
author Jeff Sharkey <jsharkey@google.com> Fri Apr 05 15:18:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 05 15:18:23 2019 +0000
tree 6b251728fe6371b9588e6f7079c0dac21c3f9346
parent ea2cba2759b4f4c2e5f0ae852df3e6de668f71e4
parent e9fcabcaa188dc00e3d8dda0165f04f9c29d1831

Merge "Fix isExternalStorageSandboxed() bug." into qt-dev

core/java/android/os/Environment.java

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index f7e927e..9e9e68d 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -1147,9 +1147,16 @@
     public static boolean isExternalStorageSandboxed(@NonNull File path) {
         final Context context = AppGlobals.getInitialApplication();
         final AppOpsManager appOps = context.getSystemService(AppOpsManager.class);
-        return appOps.noteOpNoThrow(AppOpsManager.OP_LEGACY_STORAGE,
+
+        final boolean hasLegacy = appOps.noteOpNoThrow(AppOpsManager.OP_LEGACY_STORAGE,
                 context.getApplicationInfo().uid,
-                context.getPackageName()) != AppOpsManager.MODE_ALLOWED;
+                context.getPackageName()) == AppOpsManager.MODE_ALLOWED;
+
+        // STOPSHIP: only use app-op once permission model has fully landed
+        final boolean requestedLegacy = !AppGlobals.getInitialApplication().getApplicationInfo()
+                .isExternalStorageSandboxAllowed();
+
+        return !(hasLegacy || requestedLegacy);
     }
 
     static File getDirectory(String variableName, String defaultPath) {