commit | 0bfebadf304bdd5f921e80f93de3e0d13b88b79c | [log] [tgz] |
---|---|---|
author | Jing Ji <jji@google.com> | Mon Nov 04 14:22:27 2019 -0800 |
committer | Jing Ji <jji@google.com> | Tue Nov 05 00:50:56 2019 +0000 |
tree | 39ef7ab04cf5b9c7259db2c2a5f96e56a075bc83 | |
parent | b730f1984f382f53bdafadad59e6070d5d0d99ba [diff] |
Prevent system uid component from running in an isolated app process Bug: 140055304 Test: Manua Change-Id: Ie7f6ed23f0c6009aad0f67a00af119b02cdceac3 Merged-In: I5a1618fab529cb0300d4a8e9c7762ee218ca09eb
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 32533c2..348a037 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3562,7 +3562,8 @@ final int procCount = procs.size(); for (int i = 0; i < procCount; i++) { final int procUid = procs.keyAt(i); - if (UserHandle.isApp(procUid) || !UserHandle.isSameUser(procUid, uid)) { + if (UserHandle.isApp(procUid) || !UserHandle.isSameUser(procUid, uid) + || UserHandle.isIsolated(procUid)) { // Don't use an app process or different user process for system component. continue; }