Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Abhijeet Kaur
2021-02-10 19:53:44 +00:00
committed by Android (Google) Code Review
parent 17e971d531 01b5acc4b3
commit 898dbfd4a3
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/os/Environment.java
View File

@@ -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,