From d94cd5c0679952ae606fde2fe6ef4753e723adad Mon Sep 17 00:00:00 2001 From: Pavel Grafov Date: Tue, 4 Oct 2022 13:42:15 +0000 Subject: [PATCH] Add cross-user check to streaming policy getters Bug: 235822336 Bug: 235821829 Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.NearbyAppStreamingPolicyTest Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.NearbyNotificationStreamingPolicyTest Change-Id: If8c10b5742f256d0b954a89634f2ca3e41d46778 --- .../android/server/devicepolicy/DevicePolicyManagerService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index fbb8537939151..c43e298b3f281 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7709,6 +7709,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()) { @@ -7749,6 +7750,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()) {