Merge "Merge "store preferential configs if no error from CS" am: f315172a7e... (cb33a667) · Commits · e / os / android_frameworks_base

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

+15 −9

Original line number	Diff line number	Diff line
		@@ -14837,6 +14837,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		"Caller is not managed profile owner or device owner;"
		+ " only managed profile owner or device owner may control the preferential"
		+ " network service");

		try {
		updateNetworkPreferenceForUser(caller.getUserId(), preferentialNetworkServiceConfigs);
		synchronized (getLockObject()) {
		final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
		caller.getUserId());
		@@ -14847,7 +14850,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		saveSettingsLocked(caller.getUserId());
		}
		}
		updateNetworkPreferenceForUser(caller.getUserId(), preferentialNetworkServiceConfigs);
		} catch (Exception e) {
		Slogf.e(LOG_TAG, "Failed to set preferential network service configs");
		throw e;
		}
		DevicePolicyEventLogger
		.createEvent(DevicePolicyEnums.SET_PREFERENTIAL_NETWORK_SERVICE_ENABLED)
		.setBoolean(preferentialNetworkServiceConfigs