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

This commit is contained in:
TreeHugger Robot
2022-01-13 18:41:34 +00:00
committed by Android (Google) Code Review

View File

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