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

Commit 3d14e32a authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Get device owner app admin 

Get device owner app admin when prefentialNetworkService is
configured by device owner

Bug: 219651203
Test: cts
Change-Id: Ic748227e8d12896361216f6ea67776660b752e4e
parent 9640eb5e

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

+3 −2
Original line number Diff line number Diff line
@@ -12269,7 +12269,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)) {
@@ -12299,7 +12299,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;

        }

    }