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

Commit 898dbfd4 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by Android (Google) Code Review
Browse files

Merge "Make OP_NO_ISOLATED_STORAGE accessible via public API" into sc-dev

parents 17e971d5 01b5acc4

core/java/android/os/Environment.java

+11 −2
Original line number Diff line number Diff line
@@ -1359,8 +1359,17 @@ public class Environment { 
        }



        final AppOpsManager appOps = context.getSystemService(AppOpsManager.class);

        return appOps.checkOpNoThrow(AppOpsManager.OP_LEGACY_STORAGE,

                uid, context.getOpPackageName()) == AppOpsManager.MODE_ALLOWED;

        final String opPackageName = context.getOpPackageName();



        if (appOps.noteOpNoThrow(AppOpsManager.OP_LEGACY_STORAGE, uid,

                opPackageName) == AppOpsManager.MODE_ALLOWED) {

            return true;

        }



        // Legacy external storage access is granted to instrumentations invoked with

        // "--no-isolated-storage" flag.

        return appOps.noteOpNoThrow(AppOpsManager.OP_NO_ISOLATED_STORAGE, uid,

                opPackageName) == AppOpsManager.MODE_ALLOWED;

    }



    private static boolean isScopedStorageEnforced(boolean defaultScopedStorage,