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

Merge "Do not enable storage app data isolation on special mount options app" into rvc-dev am: e96d92cdc0 am: 5a03692483

Browse Source 
Change-Id: Id5cb564672cb3e27cb9cbf71955bc431c377e556
This commit is contained in:
TreeHugger Robot
2020-04-23 11:38:35 +00:00
committed by Automerger Merge Worker
parent 1014a49673 5a03692483
commit 955cfa7c59
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -2181,6 +2181,17 @@ public final class ProcessList {
return result; return result;
} }
private boolean needsStorageDataIsolation(StorageManagerInternal storageManagerInternal,
ProcessRecord app) {
return mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)
&& !storageManagerInternal.isExternalStorageService(app.uid)
// Special mounting mode doesn't need to have data isolation as they won't
// access /mnt/user anyway.
&& app.mountMode != Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE
&& app.mountMode != Zygote.MOUNT_EXTERNAL_PASS_THROUGH
&& app.mountMode != Zygote.MOUNT_EXTERNAL_INSTALLER;
}
private Process.ProcessStartResult startProcess(HostingRecord hostingRecord, String entryPoint, private Process.ProcessStartResult startProcess(HostingRecord hostingRecord, String entryPoint,
ProcessRecord app, int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags, ProcessRecord app, int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags,
int mountExternal, String seInfo, String requiredAbi, String instructionSet, int mountExternal, String seInfo, String requiredAbi, String instructionSet,
@@ -2237,8 +2248,7 @@ public final class ProcessList {
int userId = UserHandle.getUserId(uid); int userId = UserHandle.getUserId(uid);
StorageManagerInternal storageManagerInternal = LocalServices.getService( StorageManagerInternal storageManagerInternal = LocalServices.getService(
StorageManagerInternal.class); StorageManagerInternal.class);
if (mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid) if (needsStorageDataIsolation(storageManagerInternal, app)) {
&& !storageManagerInternal.isExternalStorageService(uid)) {
bindMountAppStorageDirs = true; bindMountAppStorageDirs = true;
if (pkgDataInfoMap == null || if (pkgDataInfoMap == null ||
!storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(), !storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(),