Merge "Add missing check in hasGrantedPolicy"

This commit is contained in:
Ayush Sharma
2021-09-15 18:04:58 +00:00
committed by Android (Google) Code Review

View File

@@ -3624,6 +3624,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);