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
This commit is contained in:
@@ -106,14 +106,12 @@ public class WifiMeteredPreferenceController2 extends BasePreferenceController i
|
|||||||
|
|
||||||
private int getWifiEntryMeteredChoice(WifiConfiguration wifiConfiguration) {
|
private int getWifiEntryMeteredChoice(WifiConfiguration wifiConfiguration) {
|
||||||
switch (wifiConfiguration.meteredOverride) {
|
switch (wifiConfiguration.meteredOverride) {
|
||||||
case WifiConfiguration.METERED_OVERRIDE_NONE:
|
|
||||||
return WifiEntry.METERED_CHOICE_AUTO;
|
|
||||||
case WifiConfiguration.METERED_OVERRIDE_METERED:
|
case WifiConfiguration.METERED_OVERRIDE_METERED:
|
||||||
return WifiEntry.METERED_CHOICE_METERED;
|
return WifiEntry.METERED_CHOICE_METERED;
|
||||||
case WifiConfiguration.METERED_OVERRIDE_NOT_METERED:
|
case WifiConfiguration.METERED_OVERRIDE_NOT_METERED:
|
||||||
return WifiEntry.METERED_CHOICE_UNMETERED;
|
return WifiEntry.METERED_CHOICE_UNMETERED;
|
||||||
default:
|
default:
|
||||||
return WifiEntry.METERED_CHOICE_UNKNOWN;
|
return WifiEntry.METERED_CHOICE_AUTO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user