Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev (b1e20609) · Commits · e / os / android_frameworks_base

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -8517,13 +8517,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}

		private boolean isDeviceOwnerUserId(int userId) {
		synchronized (getLockObject()) {
		return mOwners.hasDeviceOwner()
		&& mOwners.getDeviceOwnerUserId() == userId;
		}
		}

		private boolean isDeviceOwnerPackage(String packageName, int userId) {
		synchronized (getLockObject()) {
		return mOwners.hasDeviceOwner()
		@@ -18275,7 +18268,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		private void updateNetworkPreferenceForUser(int userId,
		List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {
		if (!isManagedProfile(userId) && !isDeviceOwnerUserId(userId)) {
		if (!isManagedProfile(userId)) {
		return;
		}
		List<ProfileNetworkPreference> preferences = new ArrayList<>();