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

Commit 2080bfed authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker Committed by Anis Assi
Browse files

Merge cherrypicks of [16460072] into security-aosp-rvc-release. 

Change-Id: I8fa49223506e5c4a1559f2ea1204187d7be8ba7b
parents 7699e133 dc066568

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

+3 −0
Original line number Diff line number Diff line
@@ -9381,6 +9381,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            final ComponentName doComponent = mOwners.getDeviceOwnerComponent();

            final ComponentName poComponent =

                    mOwners.getProfileOwnerComponent(userHandle.getIdentifier());

            if (supervisorComponent == null) {

                return null;

            }

            if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(

                    poComponent)) {

                return supervisorComponent;