From 94f10ec0b5a703b710f33de3a8b48047fa0ac093 Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Wed, 29 Jan 2020 15:37:29 -0800 Subject: [PATCH] Remove WifiEntry.METERED_CHOICE_UNKNOWN METERED_CHOICE_UNKNOWN should represent the default value of the metered choice, but this can be represented by METERED_CHOICE_AUTO already. Bug: 70983952 Test: build Change-Id: I3bea9217e197ff88eba606be9235b1db65158425 --- .../wifi/details2/WifiMeteredPreferenceController2.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java index 7df62bf3b49..a68f64fe8f2 100644 --- a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java @@ -106,14 +106,12 @@ public class WifiMeteredPreferenceController2 extends BasePreferenceController i private int getWifiEntryMeteredChoice(WifiConfiguration wifiConfiguration) { switch (wifiConfiguration.meteredOverride) { - case WifiConfiguration.METERED_OVERRIDE_NONE: - return WifiEntry.METERED_CHOICE_AUTO; case WifiConfiguration.METERED_OVERRIDE_METERED: return WifiEntry.METERED_CHOICE_METERED; case WifiConfiguration.METERED_OVERRIDE_NOT_METERED: return WifiEntry.METERED_CHOICE_UNMETERED; default: - return WifiEntry.METERED_CHOICE_UNKNOWN; + return WifiEntry.METERED_CHOICE_AUTO; } } }