| commit | 554e19a375bb3c61db7643b17ea411baf6bbe3e5 | [log] [tgz] |
|---|---|---|
| author | Ayush Sharma <ayushsha@google.com> | Tue Dec 14 22:13:11 2021 +0000 |
| committer | Ayush Sharma <ayushsha@google.com> | Tue Dec 21 12:37:54 2021 +0000 |
| tree | 8561c8201cd8e4735455ffbba1d987ada7c9c51e | |
| parent | f774fb2f758803ee62d3caa89ec6ab87e985b36c [diff] |
Enforce QUERY_ADMIN_POLICY for getGlobalProxyAdmin Bug: 206127671 Test: NA Change-Id: Id4bce828bc69867c9c4d20b991e9e53e8ae385f2
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 266b656..df8953c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7459,7 +7459,8 @@ Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId"); final CallerIdentity caller = getCallerIdentity(); - Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle)); + Preconditions.checkCallAuthorization( + hasFullCrossUsersPermission(caller, userHandle) && canQueryAdminPolicy(caller)); synchronized (getLockObject()) { DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);