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

Commit 5fab2e2b authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Alex Spradlin
Browse files

Get device owner app admin 

This was erroneously merged blank in ag/17350616.

Bug: 226691866
Change-Id: Ic748227e8d12896361216f6ea67776660b752e4e
parent 259d0320

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

+3 −2
Original line number Diff line number Diff line
@@ -12268,7 +12268,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                        + " only profile owner or device owner may control the preferential"

                        + " network service");

        synchronized (getLockObject()) {

            final ActiveAdmin requiredAdmin = getProfileOwnerAdminLocked(

            final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(

                    caller.getUserId());

            if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(

                    preferentialNetworkServiceConfigs)) {
@@ -12298,7 +12298,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                        + " only profile owner or device owner may retrieve the preferential"

                        + " network service configurations");

        synchronized (getLockObject()) {

            final ActiveAdmin requiredAdmin = getProfileOwnerAdminLocked(caller.getUserId());

            final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(

                    caller.getUserId());

            return requiredAdmin.mPreferentialNetworkServiceConfigs;

        }

    }