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

Commit 89204bd4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 10a222bf

Change-Id: I644c984dbc3de7518a7bb50427b848aafb3b2944
parents 236e1c30 10a222bf

core/java/android/os/Environment.java

+9 −2
Original line number Diff line number Diff line
@@ -1147,9 +1147,16 @@ public class Environment { 
    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) {