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

Commit 30c0344a authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

parents b329d300 262bf31a

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;

        }

        }

    }

    }