Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f32340 authored by Jing Ji's avatar Jing Ji Committed by android-build-merger
Browse files

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

am: 909ff7dc

Change-Id: Ib725e69bbd84c7e1e141c32c62c5204bd552b12f
parents 8ff59f6a 909ff7dc

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

+2 −1
Original line number Diff line number Diff line
@@ -3546,7 +3546,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;

                }