diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-01-13 18:41:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-13 18:41:34 +0000 |
| commit | c826749c9045bf5d55bc0684e778f9159e36bdc7 (patch) | |
| tree | e0e02610c3fb312cca33729f6ae717ff0ab29a64 | |
| parent | 43c6f30d8d86e9efaf8f2d39d13c3801f58a6fe2 (diff) | |
| parent | b84b315bce5532641580187bb6ae76473f753c01 (diff) | |
Merge "Enforce system privilege for getGlobalProxyAdmin" into sc-v2-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index abccc3b91282..774a485aac6b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7464,7 +7464,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); |