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

Browse Source 
Change-Id: Ieb0aaad01715d1666b652ab1cb4e9bee9eb742bc
This commit is contained in:
Suprabh Shukla
2020-05-19 06:56:26 +00:00
committed by Automerger Merge Worker
parent d3eb223b7e 54f0b9e24c
commit 12cd148263
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;
}