PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-10 19:33:29 +00:00
committed by Android (Google) Code Review
parent dc2db6c6c9 78c3f368c3
commit 4804c2c7a5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
View File

@@ -103,7 +103,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
// 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY // 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY
if (!isDualMode && WifiConfiguration.AP_BAND_ANY == band) { if (!isDualMode && WifiConfiguration.AP_BAND_ANY == band) {
return WifiConfiguration.AP_BAND_5GHZ; return WifiConfiguration.AP_BAND_5GHZ;
} else if (!mWifiManager.is5GHzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) { } else if (!is5GhzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) {
return WifiConfiguration.AP_BAND_2GHZ; return WifiConfiguration.AP_BAND_2GHZ;
} else if (isDualMode && WifiConfiguration.AP_BAND_5GHZ == band) { } else if (isDualMode && WifiConfiguration.AP_BAND_5GHZ == band) {
return WifiConfiguration.AP_BAND_ANY; return WifiConfiguration.AP_BAND_ANY;

13
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
View File

@@ -104,6 +104,7 @@ public class WifiTetherApBandPreferenceControllerTest {
@Test @Test
public void display_5GhzNotSupported_shouldDisable() { public void display_5GhzNotSupported_shouldDisable() {
when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.isDualBandSupported()).thenReturn(false); when(mWifiManager.isDualBandSupported()).thenReturn(false);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -115,7 +116,8 @@ public class WifiTetherApBandPreferenceControllerTest {
@Test @Test
public void changePreference_noDualModeWith5G_shouldUpdateValue() { public void changePreference_noDualModeWith5G_shouldUpdateValue() {
when(mWifiManager.is5GHzBandSupported()).thenReturn(true); when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.isDualBandSupported()).thenReturn(true);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -141,7 +143,8 @@ public class WifiTetherApBandPreferenceControllerTest {
@Test @Test
public void changePreference_dualModeWith5G_shouldUpdateValue() { public void changePreference_dualModeWith5G_shouldUpdateValue() {
when(mWifiManager.is5GHzBandSupported()).thenReturn(true); when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.isDualBandSupported()).thenReturn(true);
when(mWifiManager.isDualModeSupported()).thenReturn(true); when(mWifiManager.isDualModeSupported()).thenReturn(true);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -167,14 +170,16 @@ public class WifiTetherApBandPreferenceControllerTest {
@Test @Test
public void updateDisplay_shouldUpdateValue() { public void updateDisplay_shouldUpdateValue() {
when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.isDualBandSupported()).thenReturn(true);
// Set controller band index to 1 and verify is set. // Set controller band index to 1 and verify is set.
when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, "1"); mController.onPreferenceChange(mPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(1); assertThat(mController.getBandIndex()).isEqualTo(1);
// Disable 5Ghz band // Disable 5Ghz band
when(mWifiManager.is5GHzBandSupported()).thenReturn(false); when(mWifiManager.isDualBandSupported()).thenReturn(false);
// Call updateDisplay and verify it's changed. // Call updateDisplay and verify it's changed.
mController.updateDisplay(); mController.updateDisplay();