Merge "Fix unsuspend from dialog on secondary users" into rvc-dev

This commit is contained in:
Suprabh Shukla
2020-05-19 06:39:48 +00:00
committed by Android (Google) Code Review

View File

@@ -13221,7 +13221,9 @@ public class PackageManagerService extends IPackageManager.Stub
private void enforceCanSetPackagesSuspendedAsUser(String callingPackage, int callingUid, private void enforceCanSetPackagesSuspendedAsUser(String callingPackage, int callingUid,
int userId, String callingMethod) { 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; return;
} }