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

Commit d2149687 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Private DNS: Fix handling of null mode"

parents a0bf4d7a 65acd234

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: