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

Commit 3e5c74ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Add cross-user check to streaming policy getters" into tm-qpr-dev

parents e6914146 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()) {