commit 731ee1a3575b7374bde9ae8957db07ba0f0be238
author Pavel Grafov <pgrafov@google.com> Tue Oct 04 13:42:15 2022 +0000
committer Pavel Grafov <pgrafov@google.com> Tue Oct 04 18:04:29 2022 +0000
tree 94762f0198b265a10a44ebf188797d4058e7144c
parent 6bf944b758fdc8728c3ee2aee83a2379aa72cb2d

RESTRICT AUTOMERGE 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

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 6aca14f0..538d6bc 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 @@
         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 @@
         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()) {