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

Commit 65acd234 authored by Eran Messeri's avatar Eran Messeri
Browse files

Private DNS: Fix handling of null mode 

Address the case where the Private DNS mode has not been set at all, so
the value obtained from settings when reading it is null.

Java cannot cope with null value in a switch statement, so translate
that case to the default value (from the ConnectivityManager), in the
same way the Settings code does when presenting Private DNS mode to the
user.

Bug: 112982691
Test: Factory reset a device, then atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Change-Id: Ife6b5c15b70517f75d8815103a19a9ef72122212
parent a13ea6fd

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

+6 −1
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return Settings.Global.getInt(mContext.getContentResolver(), name, def);

        }













        @Nullable















        String settingsGlobalGetString(String name) {















            return Settings.Global.getString(mContext.getContentResolver(), name);















        }










@@ -13901,7 +13902,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























        Preconditions.checkNotNull(who, "ComponentName is null");















        enforceDeviceOwner(who);













        switch (mInjector.settingsGlobalGetString(PRIVATE_DNS_MODE)) {













        String currentMode = mInjector.settingsGlobalGetString(PRIVATE_DNS_MODE);













        if (currentMode == null) {













            currentMode = ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK;













        }













        switch (currentMode) {















            case ConnectivityManager.PRIVATE_DNS_MODE_OFF:















                return PRIVATE_DNS_MODE_OFF;















            case ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC: