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

Merge "[OWE] Rename isOweSupported to isEnhancedOpenSupported"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-01 18:29:48 +00:00
committed by Android (Google) Code Review
parent 7d776450e3 9d8d090c08
commit a0b4aeeb9d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -1509,7 +1509,7 @@ public class WifiConfigController implements TextWatcher,
// Populate the Wi-Fi security spinner with the various supported key management types // Populate the Wi-Fi security spinner with the various supported key management types
spinnerAdapter.add(mContext.getString(R.string.wifi_security_none)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_none));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_NONE; mSecurityInPosition[idx++] = AccessPoint.SECURITY_NONE;
if (mWifiManager.isOweSupported()) { if (mWifiManager.isEnhancedOpenSupported()) {
spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe)); spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe));
mSecurityInPosition[idx++] = AccessPoint.SECURITY_OWE; mSecurityInPosition[idx++] = AccessPoint.SECURITY_OWE;
} }

2
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -324,7 +324,7 @@ public class WifiConfigControllerTest {
WifiManager wifiManager = mock(WifiManager.class); WifiManager wifiManager = mock(WifiManager.class);
when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible); when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible);
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible); when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible);
when(wifiManager.isOweSupported()).thenReturn(oweVisible); when(wifiManager.isEnhancedOpenSupported()).thenReturn(oweVisible);
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
WifiConfigUiBase.MODE_MODIFY, wifiManager); WifiConfigUiBase.MODE_MODIFY, wifiManager);