commit bad878c2f507a8bddb431438a3631299bbdda260
author Mark Kim <markvk@google.com> Mon Dec 11 17:12:45 2023 +0000
committer Mark Kim <markvk@google.com> Thu Dec 14 10:38:26 2023 +0000
tree aeee7d24bc09311d6c5cf790b31319dbfe694a9b
parent 88f614db37c4767d635a698f1a69ceca9f83fb70

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

Test: PackageArchiverTest

Bug: 314949494
Change-Id: I665d0a330dbf32e1da5b1e65b5308c8125c0208e

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,