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

Commit d154af9b 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 

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



Change-Id: Ic52314d7a29a04495ddb151cf966d5a25a67cbca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 397fa5b9 f315172a

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

+15 −9
Original line number Diff line number Diff line
@@ -12172,6 +12172,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                "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());









@@ -12182,7 +12185,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                    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