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

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

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

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

Change-Id: I803128a2f5c7959b0dca5a4174fc42b4cbd8b85a
parents 125e2f63 c826749c

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

+2 −1
Original line number Diff line number Diff line
@@ -7465,7 +7465,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) && isSystemUid(caller));





























        synchronized (getLockObject()) {















            DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);