Merge "Prevent system uid component from running in an isolated app process" into oc-dev

2019-11-05 23:52:53 +00:00
parent 702d394762 0bfebadf30
commit 909ff7dc71
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3562,7 +3562,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;
                }