summaryrefslogtreecommitdiff
path: root/core/java/android/os/Environment.java
diff options
context:
space:
mode:
authorAbhijeet Kaur <abkaur@google.com>2020-04-06 14:17:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-06 14:17:03 +0000
commit34dd66d8dba61d711394a7605c71bb4a80c05de6 (patch)
tree8848a28dea89095e54ad094ee05cab438a8d5330 /core/java/android/os/Environment.java
parentb4a10ded45effcd92ca56f226a9f22a054585a21 (diff)
parent4d0f93b743a9216fa50de8e9b85dc7dcd2cff6cf (diff)
Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec22 am: ca6a0f9999 am: 6b39d37d39 am: 3c4a4a4bb3 am: 4d0f93b743
Change-Id: Ifd7eacd036405016177569d0c0eb11083ad4775e
Diffstat (limited to 'core/java/android/os/Environment.java')
-rw-r--r--core/java/android/os/Environment.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 55cb12e0e35b..97ec7a3c612b 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -1271,6 +1271,7 @@ public class Environment {
public static boolean isExternalStorageLegacy(@NonNull File path) {
final Context context = AppGlobals.getInitialApplication();
final int uid = context.getApplicationInfo().uid;
+ // Isolated processes and Instant apps are never allowed to be in scoped storage
if (Process.isIsolated(uid)) {
return false;
}
@@ -1280,8 +1281,6 @@ public class Environment {
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 forceEnableScopedStorage = Compatibility.isChangeEnabled(
FORCE_ENABLE_SCOPED_STORAGE);