From b45eefcadc93d5a876303ac5757a23787eb7b83e Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Mon, 4 May 2020 00:20:38 -0700 Subject: [PATCH] Fix unsuspend from dialog on secondary users Test: atest --user-type secondary_user \ android.suspendapps.cts.DialogTests Bug: 150741315 Change-Id: If2f49c5b7c03d1a14097e53da0fe601ae317872e --- .../java/com/android/server/pm/PackageManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 8b191dda5590e..5b9e84844fc02 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -13150,7 +13150,9 @@ public class PackageManagerService extends IPackageManager.Stub private void enforceCanSetPackagesSuspendedAsUser(String callingPackage, int callingUid, int userId, String callingMethod) { - if (callingUid == Process.ROOT_UID || callingUid == Process.SYSTEM_UID) { + if (callingUid == Process.ROOT_UID + // Need to compare app-id to allow system dialogs access on secondary users + || UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) { return; }