Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "store preferential configs if no error from CS" am: f315172a7e am: d154af9bf8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2603286

Change-Id: I5f247ecbb8c935a828cd93c560835d40d88b082d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sooraj Sasindran
2023-05-26 00:20:41 +00:00
committed by Automerger Merge Worker
parent 30af69150e d154af9bf8
commit 66c5ab1f9f
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -12198,17 +12198,23 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
"Caller is not managed profile owner or device owner;" "Caller is not managed profile owner or device owner;"
+ " only managed profile owner or device owner may control the preferential" + " only managed profile owner or device owner may control the preferential"
+ " network service"); + " network service");
synchronized (getLockObject()) {
final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked( try {
caller.getUserId()); updateNetworkPreferenceForUser(caller.getUserId(), preferentialNetworkServiceConfigs);
if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals( synchronized (getLockObject()) {
preferentialNetworkServiceConfigs)) { final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
requiredAdmin.mPreferentialNetworkServiceConfigs = caller.getUserId());
new ArrayList<>(preferentialNetworkServiceConfigs); if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(
saveSettingsLocked(caller.getUserId()); preferentialNetworkServiceConfigs)) {
requiredAdmin.mPreferentialNetworkServiceConfigs =
new ArrayList<>(preferentialNetworkServiceConfigs);
saveSettingsLocked(caller.getUserId());
}
} }
} catch (Exception e) {
Slogf.e(LOG_TAG, "Failed to set preferential network service configs");
throw e;
} }
updateNetworkPreferenceForUser(caller.getUserId(), preferentialNetworkServiceConfigs);
DevicePolicyEventLogger DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.SET_PREFERENTIAL_NETWORK_SERVICE_ENABLED) .createEvent(DevicePolicyEnums.SET_PREFERENTIAL_NETWORK_SERVICE_ENABLED)
.setBoolean(preferentialNetworkServiceConfigs .setBoolean(preferentialNetworkServiceConfigs