Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64b856c6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf14 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542

Change-Id: I2db172a0718dc77f1f73d94d60edcfe982416d97
parents 8e00cdd0 0beddf14

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -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);