commit | cb4e9efb49f1b8f552d2eb074954bb6ff502d4f5 | [log] [tgz] |
---|---|---|
author | Jing Ji <jji@google.com> | Mon Nov 04 14:22:27 2019 -0800 |
committer | Kyriakos Ispoglou <ispo@google.com> | Thu Nov 07 16:20:09 2019 -0800 |
tree | 6dfd7604ac247615b7748046b99a3ab117c9b885 | |
parent | 4f90bf5a8956187562e2c53d41d7e2730b01a670 [diff] |
Prevent system uid component from running in an isolated app process Bug: 140055304 Test: Manua Change-Id: Ie7f6ed23f0c6009aad0f67a00af119b02cdceac3 Merged-In: I5a1618fab529cb0300d4a8e9c7762ee218ca09eb (cherry picked from commit 0bfebadf304bdd5f921e80f93de3e0d13b88b79c)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 0327842..4771acc 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; }