Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b443b0 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Add cross-user check to streaming policy getters am: 731ee1a3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20112391



Change-Id: I7492fb78503306ef0abc930dcdc3de1f204c0056
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8f6f69b 731ee1a3

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

+2 −0
Original line number Diff line number Diff line
@@ -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()) {