diff options
| author | 2022-10-05 18:36:13 +0000 | |
|---|---|---|
| committer | 2022-10-05 18:36:13 +0000 | |
| commit | 3e5c74adf4c36aee6f635dfae4a686eb8a15ee2c (patch) | |
| tree | 327c0889bb9dd3a35db1ea0f1cdb70e24ff451d2 | |
| parent | e6914146c522cec9da115cdfcf4b844e140e7cb3 (diff) | |
| parent | 731ee1a3575b7374bde9ae8957db07ba0f0be238 (diff) | |
Merge "RESTRICT AUTOMERGE Add cross-user check to streaming policy getters" into tm-qpr-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 6aca14f08188..538d6bc85278 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7783,6 +7783,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization( isProfileOwner(caller) || isDefaultDeviceOwner(caller) || hasCallingOrSelfPermission(permission.READ_NEARBY_STREAMING_POLICY)); + Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId)); synchronized (getLockObject()) { if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) { @@ -7823,6 +7824,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization( isProfileOwner(caller) || isDefaultDeviceOwner(caller) || hasCallingOrSelfPermission(permission.READ_NEARBY_STREAMING_POLICY)); + Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId)); synchronized (getLockObject()) { if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) { |