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

Commit a4111f53 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: If1d010b01aebdd79e8a91bb2e2163293b131ef71
parents fa150bbc 2844eaf9

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;

        }

    }