From a42d1cf2ac650d7a6be79384c42fc08dfa533ec7 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Mon, 17 Jan 2022 19:57:05 +0100
Subject: [PATCH] Make ProcessRecord.isolated more robust.

There will be additional cases beyond isolated services where the UID of
the process is different from the UID of the defining package.
Explicitly check for the isolated UID range.

Bug: 215012578
Test: N/A
Change-Id: I39c351f10876ffc2bdb7680bfab9ebf8bddc8153
---
 services/core/java/com/android/server/am/ProcessRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index c830554c398b7..be187e21db47d 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -513,7 +513,7 @@ class ProcessRecord implements WindowProcessListener {
             }
         }
         processInfo = procInfo;
-        isolated = _info.uid != _uid;
+        isolated = Process.isIsolated(_uid);
         appZygote = (UserHandle.getAppId(_uid) >= Process.FIRST_APP_ZYGOTE_ISOLATED_UID
                 && UserHandle.getAppId(_uid) <= Process.LAST_APP_ZYGOTE_ISOLATED_UID);
         uid = _uid;