diff options
| author | Ram Muthiah <rammuthiah@google.com> | 2020-03-28 00:22:44 +0000 |
|---|---|---|
| committer | Ram Muthiah <rammuthiah@google.com> | 2020-03-28 02:39:58 +0000 |
| commit | 7929c5dced718280ff96ce4e904c1276c32ec2b8 (patch) | |
| tree | bd09588072fb8fb1d378702a4f4cb48eb0dcb1a1 /core/java/android/os/Process.java | |
| parent | 2cd955e79d32832f3eb38227713a5235309f253f (diff) | |
Revert "Do not mount whitelisted package in storage data and obb dirs"
This reverts commit 2cd955e79d32832f3eb38227713a5235309f253f.
Reason for revert: Bisect indicates this change causes b/152550025
Bug: 152550025
Bug: 151218156
Change-Id: I350bfc44d2137416bd23591fffbe4284e1462a91
Diffstat (limited to 'core/java/android/os/Process.java')
| -rw-r--r-- | core/java/android/os/Process.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 5d2c9d18c00c..b7b3c4fc8add 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -607,9 +607,6 @@ public class Process { * started. * @param pkgDataInfoMap Map from related package names to private data directory * volume UUID and inode number. - * @param whitelistedDataInfoMap Map from whitelisted package names to private data directory - * volume UUID and inode number. - * @param bindMountAppsData whether zygote needs to mount CE and DE data. * @param bindMountAppStorageDirs whether zygote needs to mount Android/obb and Android/data. * @param zygoteArgs Additional arguments to supply to the zygote process. * @return An object that describes the result of the attempt to start the process. @@ -634,17 +631,13 @@ public class Process { @Nullable long[] disabledCompatChanges, @Nullable Map<String, Pair<String, Long>> pkgDataInfoMap, - @Nullable Map<String, Pair<String, Long>> - whitelistedDataInfoMap, - boolean bindMountAppsData, boolean bindMountAppStorageDirs, @Nullable String[] zygoteArgs) { return ZYGOTE_PROCESS.start(processClass, niceName, uid, gid, gids, runtimeFlags, mountExternal, targetSdkVersion, seInfo, abi, instructionSet, appDataDir, invokeWith, packageName, zygotePolicyFlags, isTopApp, disabledCompatChanges, - pkgDataInfoMap, whitelistedDataInfoMap, bindMountAppsData, - bindMountAppStorageDirs, zygoteArgs); + pkgDataInfoMap, bindMountAppStorageDirs, zygoteArgs); } /** @hide */ @@ -668,8 +661,7 @@ public class Process { runtimeFlags, mountExternal, targetSdkVersion, seInfo, abi, instructionSet, appDataDir, invokeWith, packageName, /*zygotePolicyFlags=*/ ZYGOTE_POLICY_FLAG_EMPTY, /*isTopApp=*/ false, - disabledCompatChanges, /* pkgDataInfoMap */ null, - /* whitelistedDataInfoMap */ null, false, false, zygoteArgs); + disabledCompatChanges, /* pkgDataInfoMap */ null, false, zygoteArgs); } /** |