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

Commit c826749c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enforce system privilege for getGlobalProxyAdmin" into sc-v2-dev

parents 43c6f30d b84b315b

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

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

        Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId");

















        final CallerIdentity caller = getCallerIdentity();







        final CallerIdentity caller = getCallerIdentity();











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







        Preconditions.checkCallAuthorization(














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



























        synchronized (getLockObject()) {







        synchronized (getLockObject()) {











            DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);







            DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);