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

Merge "Merge "store preferential configs if no error from CS" am: f315172a7e am: d154af9bf8 am: 66c5ab1f9f am: 1f0220efa6" into udc-d1-dev-plus-aosp am: cb33a66726

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

Change-Id: I27e1ac12e8fbec86c82bf32683d6289de82e9791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-05-26 03:35:48 +00:00
parent 978f8059ef cb33a66726
commit 3b27e58450
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

@@ -14837,17 +14837,23 @@ 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");
synchronized (getLockObject()) {
final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
caller.getUserId());
if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(
preferentialNetworkServiceConfigs)) {
requiredAdmin.mPreferentialNetworkServiceConfigs =
new ArrayList<>(preferentialNetworkServiceConfigs);
saveSettingsLocked(caller.getUserId());
try {
updateNetworkPreferenceForUser(caller.getUserId(), preferentialNetworkServiceConfigs);
synchronized (getLockObject()) {
final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
caller.getUserId());
if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(
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
.createEvent(DevicePolicyEnums.SET_PREFERENTIAL_NETWORK_SERVICE_ENABLED)
.setBoolean(preferentialNetworkServiceConfigs