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

Commit f315172a authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Gerrit Code Review
Browse files

Merge "store preferential configs if no error from CS"

parents da78d227 38b01ce5

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

+15 −9
Original line number Diff line number Diff line
@@ -12166,6 +12166,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());









@@ -12176,7 +12179,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