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

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

Browse Source 
am: 10a222bf3c

Change-Id: I644c984dbc3de7518a7bb50427b848aafb3b2944
This commit is contained in:
Jeff Sharkey
2019-04-05 08:45:31 -07:00
committed by android-build-merger
parent 236e1c3093 10a222bf3c
commit 89204bd4dd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {