summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Ji <jji@google.com>2019-11-04 14:22:27 -0800
committerKyriakos Ispoglou <ispo@google.com>2019-11-07 16:19:34 -0800
commitef7e2882a5c3b48a9610070a8df81dc429189bda (patch)
treea21f827c8435906d48f3ac8155afd18fef863613
parent21af7a4109cf0989a0c6dc1627bf7137e0e83d8b (diff)
downloadbase-ef7e2882a5c3b48a9610070a8df81dc429189bda.tar.gz
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)
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 32f828531b92..0f35e3267de5 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3574,7 +3574,8 @@ public class ActivityManagerService extends IActivityManager.Stub
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;
}