Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f0220ef authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "store preferential configs if no error from CS" am: f315172a am: d154af9b am: 66c5ab1f 

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



Change-Id: I0139f9e55b6c00d52f33bde9dd2c489488016141
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59788f64 66c5ab1f

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