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

Merge "Remove a TODO as no work needs to be done" into rvc-dev

Browse Source
This commit is contained in:
Abhijeet Kaur
2020-04-06 12:36:11 +00:00
committed by Android (Google) Code Review
parent ee171cad08 fd83d9dbb7
commit a32954ec22
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1268,6 +1268,7 @@ public class Environment {
public static boolean isExternalStorageLegacy(@NonNull File path) { public static boolean isExternalStorageLegacy(@NonNull File path) {
final Context context = AppGlobals.getInitialApplication(); final Context context = AppGlobals.getInitialApplication();
final int uid = context.getApplicationInfo().uid; final int uid = context.getApplicationInfo().uid;
// Isolated processes and Instant apps are never allowed to be in scoped storage
if (Process.isIsolated(uid)) { if (Process.isIsolated(uid)) {
return false; return false;
} }
@@ -1277,8 +1278,6 @@ public class Environment {
return false; return false;
} }
// TODO(b/150672994): Compat flags do not override instant app and isolated process's
// behavior.
boolean defaultScopedStorage = Compatibility.isChangeEnabled(DEFAULT_SCOPED_STORAGE); boolean defaultScopedStorage = Compatibility.isChangeEnabled(DEFAULT_SCOPED_STORAGE);
boolean forceEnableScopedStorage = Compatibility.isChangeEnabled( boolean forceEnableScopedStorage = Compatibility.isChangeEnabled(
FORCE_ENABLE_SCOPED_STORAGE); FORCE_ENABLE_SCOPED_STORAGE);