Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev

This commit is contained in:
TreeHugger Robot
2021-10-01 09:54:29 +00:00
committed by Android (Google) Code Review

View File

@@ -3599,6 +3599,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
Preconditions.checkCallAuthorization(
isCallingFromPackage(adminReceiver.getPackageName(), caller.getUid())
|| isSystemUid(caller));
synchronized (getLockObject()) {
ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle);