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

Migrate WifiManager.isDualModeSupported() to isStaApConcurrencySupported()

Browse Source 
isDualModeSupported is being removed, replace it
with isStaApConcurrencySupported.

Bug: 144925765
Test: compiles
Change-Id: Ia3a0417a154ea401579a039113e96ba4578ffd80
This commit is contained in:
David Su
2020-01-29 14:46:33 -08:00
parent 8ad24a25ad
commit 8ab62a8750
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
public WifiTetherApBandPreferenceController(Context context, public WifiTetherApBandPreferenceController(Context context,
OnTetherConfigUpdateListener listener) { OnTetherConfigUpdateListener listener) {
super(context, listener); super(context, listener);
isDualMode = mWifiManager.isDualModeSupported(); isDualMode = mWifiManager.isStaApConcurrencySupported();
updatePreferenceEntries(); updatePreferenceEntries();
} }

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

@@ -81,7 +81,7 @@ public class WifiTetherApBandPreferenceControllerTest {
when(mScreen.findPreference(anyString())).thenReturn(mPreference); when(mScreen.findPreference(anyString())).thenReturn(mPreference);
when(mWifiManager.getSoftApConfiguration()).thenReturn( when(mWifiManager.getSoftApConfiguration()).thenReturn(
new SoftApConfiguration.Builder().build()); new SoftApConfiguration.Builder().build());
when(mWifiManager.isDualModeSupported()).thenReturn(false); when(mWifiManager.isStaApConcurrencySupported()).thenReturn(false);
mController = new WifiTetherApBandPreferenceController(mContext, mListener); mController = new WifiTetherApBandPreferenceController(mContext, mListener);
} }
@@ -90,7 +90,7 @@ public class WifiTetherApBandPreferenceControllerTest {
public void display_5GhzSupported_shouldDisplayFullList() { public void display_5GhzSupported_shouldDisplayFullList() {
when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.is5GHzBandSupported()).thenReturn(true); when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
when(mWifiManager.isDualModeSupported()).thenReturn(true); when(mWifiManager.isStaApConcurrencySupported()).thenReturn(true);
// Create a new instance to pick the proper value of isDualModeSupported() // Create a new instance to pick the proper value of isDualModeSupported()
mController = new WifiTetherApBandPreferenceController(mContext, mListener); mController = new WifiTetherApBandPreferenceController(mContext, mListener);
@@ -156,7 +156,7 @@ public class WifiTetherApBandPreferenceControllerTest {
public void changePreference_dualModeWith5G_shouldUpdateValue() { public void changePreference_dualModeWith5G_shouldUpdateValue() {
when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.getCountryCode()).thenReturn("US");
when(mWifiManager.is5GHzBandSupported()).thenReturn(true); when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
when(mWifiManager.isDualModeSupported()).thenReturn(true); when(mWifiManager.isStaApConcurrencySupported()).thenReturn(true);
// Create a new instance to pick the proper value of isDualModeSupported() // Create a new instance to pick the proper value of isDualModeSupported()
mController = new WifiTetherApBandPreferenceController(mContext, mListener); mController = new WifiTetherApBandPreferenceController(mContext, mListener);