Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic1061ffce64bb86f4ccc28f84e72198e001ebc15
This commit is contained in:
Suprabh Shukla
2020-05-19 07:15:38 +00:00
committed by Automerger Merge Worker
parent df86703598 15de5b9eb5
commit 22bbc65619
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
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;
}