From 41466ea4898678e1cd34ecbaf1b81d7915047e36 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Thu, 10 Feb 2022 10:57:24 +0100 Subject: [PATCH] Supplemental processes don't get external storage. Bug: 217538016 Test: Inspect /storage for supplemental Change-Id: Ibd29834b0d611a7313890fe06428cd73021ebf4f --- core/java/android/os/Environment.java | 2 +- .../core/java/com/android/server/StorageManagerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 0257408b3e42d..3d129417e53b5 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -1333,7 +1333,7 @@ public class Environment { 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)) { + if (Process.isIsolated(uid) || Process.isSupplemental(uid)) { return false; } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 178b66691f2fd..42bd9269e103a 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -4674,7 +4674,7 @@ class StorageManagerService extends IStorageManager.Stub private int getMountModeInternal(int uid, String packageName) { try { // Get some easy cases out of the way first - if (Process.isIsolated(uid)) { + if (Process.isIsolated(uid) || Process.isSupplemental(uid)) { return StorageManager.MOUNT_MODE_EXTERNAL_NONE; }