commit f917eaec7924bc37300c78fc6b04c0f0f242930e
author Mark Kim <markvk@google.com> Thu Dec 14 14:20:46 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 14:20:46 2023 +0000
tree f5ba370551fb2128c1a32b7decc9ed8d50de4222
parent daa367ebbd694fa608e9979f2c66f302ad322899
parent bad878c2f507a8bddb431438a3631299bbdda260

Merge "Fix the way caller is verified to support different profiles (personal, working, etc.) during app (un-)archiving" into main

services/core/java/com/android/server/pm/PackageArchiver.java

diff --git a/services/core/java/com/android/server/pm/PackageArchiver.java b/services/core/java/com/android/server/pm/PackageArchiver.java
index 6b05edf..2864a8b 100644
--- a/services/core/java/com/android/server/pm/PackageArchiver.java
+++ b/services/core/java/com/android/server/pm/PackageArchiver.java
@@ -165,7 +165,7 @@
         Computer snapshot = mPm.snapshotComputer();
         int userId = userHandle.getIdentifier();
         int binderUid = Binder.getCallingUid();
-        if (!PackageManagerServiceUtils.isRootOrShell(binderUid)) {
+        if (!PackageManagerServiceUtils.isSystemOrRootOrShell(binderUid)) {
             verifyCaller(snapshot.getPackageUid(callerPackageName, 0, userId), binderUid);
         }
         snapshot.enforceCrossUserPermission(binderUid, userId, true, true,