commit | feedb38d84c47e99132790c56ff2f8b084e1ccaa | [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:40 2019 -0800 |
tree | 831a9d97b4d141dcf437c8c742728ba32ecbc92c | |
parent | df8e8e0376db22e6b45cde8ee8fd6c7f317b6efb [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 75e2aa4..ce31ee7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3986,7 +3986,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; }