Commit: e9c1ec70bd94e629031878afb29b62930020e2f8 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: e9c1ec70bd94e629031878afb29b62930020e2f8 (tree)
• Time: 2020-01-08 08:03:55
• Author: Jing Ji <jji@goog...>
• Commiter: Vasyl Gello

Log Message

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)

Change Summary

• modified: services/core/java/com/android/server/am/ActivityManagerService.java

Incremental Difference

--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3635,7 +3635,8 @@ public final class ActivityManagerService extends ActivityManagerNative
             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;
                 }