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

Commit 3900641f 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: I5acfe3c0df1b6b7aaa75cfdf3c3b3df110041444
parents c4c480ab 0beddf14

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -3618,6 +3618,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
















        final CallerIdentity caller = getCallerIdentity();







        final CallerIdentity caller = getCallerIdentity();











        Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));







        Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));














        Preconditions.checkCallAuthorization(














                isCallingFromPackage(adminReceiver.getPackageName(), caller.getUid())














                        || isSystemUid(caller));



























        synchronized (getLockObject()) {







        synchronized (getLockObject()) {











            ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle);







            ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle);