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

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

Change-Id: I803128a2f5c7959b0dca5a4174fc42b4cbd8b85a
This commit is contained in:
TreeHugger Robot
2022-01-13 19:00:12 +00:00
committed by Automerger Merge Worker

View File

@@ -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);