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

Commit 3b27e584 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "store preferential configs if no error from CS" am: f315172a... 

Merge "Merge "store preferential configs if no error from CS" am: f315172a am: d154af9b am: 66c5ab1f am: 1f0220ef" into udc-d1-dev-plus-aosp am: cb33a667

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



Change-Id: I27e1ac12e8fbec86c82bf32683d6289de82e9791
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 978f8059 cb33a667

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