summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2024-07-25 00:31:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-25 00:31:34 +0000
commit46a00d2aaa3a39a8a5ba429e40a36bb582279fc2 (patch)
tree293d4e4e2cced620edaba5068836d73818c6520b
parent412839393618b10c63a1625a475c2b3fb20c9cf9 (diff)
parent6ac8e78123d01aa88f12ffbc251fc94f4a899b48 (diff)
Merge "Prevent system uid component from running in an isolated app process" into main
-rw-r--r--services/core/java/com/android/server/wm/ActivityTaskManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index a84598dd73dc..1c14c5dbc43a 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5522,7 +5522,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.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.isCore(procUid) || !UserHandle.isSameUser(procUid, uid)) {
// Don't use an app process or different user process for system component.
continue;
}