commit 1722028514ca6582a917e78a05f0594d82b2d4ea
author Jing Ji <jji@google.com> Mon Nov 04 11:35:49 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 15 06:15:23 2019 +0000
tree deb3e86ffb391c8597a36a88464248545b6b6553
parent 0d7e17eb676695de8b19ad2ec33fdfcefa165b97

Prevent system uid component from running in an isolated app process

Bug: 140055304
Test: Manual
Change-Id: I5a1618fab529cb0300d4a8e9c7762ee218ca09eb
Merged-In: I5a1618fab529cb0300d4a8e9c7762ee218ca09eb
(cherry picked from commit 84f2b227b0a0e74157508f143c1ef44ef0f0be50)

services/core/java/com/android/server/am/ProcessList.java

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 838e7d3..fe29a36 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -1329,7 +1329,7 @@
             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.isCore(procUid) || !UserHandle.isSameUser(procUid, uid)) {
                     // Don't use an app process or different user process for system component.
                     continue;
                 }