Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am: 54f0b9e24c am: 15de5b9eb5

Change-Id: I0fe1b97664d0010c04779b1e2ce03dff3ab2affb
This commit is contained in:
Suprabh Shukla
2020-05-19 07:15:40 +00:00
committed by Automerger Merge Worker

View File

@@ -13221,7 +13221,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;
}