Merge "Fix failures for Webview tests in sandbox"

2022-12-17 05:04:27 +00:00
parent 431976bcd5 abe0059229
commit 2167b8f0d9
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3872,8 +3872,8 @@ public final class ActiveServices {
                            throw new SecurityException("BIND_EXTERNAL_SERVICE failed, "
                                    + className + " is not an isolatedProcess");
                        }
-                        if (AppGlobals.getPackageManager().getPackageUid(callingPackage,
-                                0, userId) != callingUid) {
+                        if (!mAm.getPackageManagerInternal().isSameApp(callingPackage, callingUid,
+                                userId)) {
                            throw new SecurityException("BIND_EXTERNAL_SERVICE failed, "
                                    + "calling package not owned by calling UID ");
                        }