Merge "Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am:... (d15085ae) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}