Merge "Get device owner app admin" into tm-mainline-prod (c1474555) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -12260,7 +12260,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)) {
		@@ -12290,7 +12290,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;
		}
		}