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

Commit cbb35df9 authored by Ayush Sharma's avatar Ayush Sharma Committed by Android (Google) Code Review
Browse files

Merge "Enforce QUERY_ADMIN_POLICY for getGlobalProxyAdmin"

parents f6471579 554e19a3

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

+2 −1
Original line number Diff line number Diff line
@@ -7459,7 +7459,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId");















        final CallerIdentity caller = getCallerIdentity();













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













        Preconditions.checkCallAuthorization(













                hasFullCrossUsersPermission(caller, userHandle) && canQueryAdminPolicy(caller));





























        synchronized (getLockObject()) {















            DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);