Make isCallerSameApp() correct for supplemental processes.

UIDs from the new supplemental process range must always map back to the
supplemental package.

Bug: 215012578
Test: atest SupplementalProcessTests, TEST_MAPPING
Change-Id: I867d163de74dd83a39936c6304a58888b921e992

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index c942a4357900..2011528eabca 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -2369,6 +2369,10 @@ public class ComputerEngine implements Computer {
     }
 
     public final boolean isCallerSameApp(String packageName, int uid) {
+        if (Process.isSupplemental(uid)) {
+            return (packageName != null
+                    && packageName.equals(mService.getSupplementalProcessPackageName()));
+        }
         AndroidPackage pkg = mPackages.get(packageName);
         return pkg != null
                 && UserHandle.getAppId(uid) == pkg.getUid();