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

Commit 262bf31a authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Get device owner app admin" into tm-dev am: 2844eaf9 

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

Change-Id: I1c51d966d766b6d3926618631d29f9d0949f646a
parents 303e266b 2844eaf9

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

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

                        + " only profile owner or device owner may control the preferential"

                        + " network service");

                        + " network service");

        synchronized (getLockObject()) {

        synchronized (getLockObject()) {

            final ActiveAdmin requiredAdmin = getProfileOwnerAdminLocked(

            final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(

                    caller.getUserId());

                    caller.getUserId());

            if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(

            if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(

                    preferentialNetworkServiceConfigs)) {

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

                        + " only profile owner or device owner may retrieve the preferential"

                        + " network service configurations");

                        + " network service configurations");

        synchronized (getLockObject()) {

        synchronized (getLockObject()) {

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

            final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(

                    caller.getUserId());

            return requiredAdmin.mPreferentialNetworkServiceConfigs;

            return requiredAdmin.mPreferentialNetworkServiceConfigs;

        }

        }

    }

    }