From 9d8d090c08cad13f5252e5ca407363045caa0643 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Thu, 28 Feb 2019 12:49:11 -0800 Subject: [PATCH] [OWE] Rename isOweSupported to isEnhancedOpenSupported Stick to the official WFA marketing name in this public API. Bug: 125850601 Test: atest com.android.server.wifi Test: Use Settings to scan and connect to OWE network Test: atest WifiConfigControllerTest Change-Id: I1360658e805b10db65f66f1194e342b063b741a4 --- src/com/android/settings/wifi/WifiConfigController.java | 2 +- .../src/com/android/settings/wifi/WifiConfigControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 59d22de6742..e7db5db9b81 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -1509,7 +1509,7 @@ public class WifiConfigController implements TextWatcher, // Populate the Wi-Fi security spinner with the various supported key management types spinnerAdapter.add(mContext.getString(R.string.wifi_security_none)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_NONE; - if (mWifiManager.isOweSupported()) { + if (mWifiManager.isEnhancedOpenSupported()) { spinnerAdapter.add(mContext.getString(R.string.wifi_security_owe)); mSecurityInPosition[idx++] = AccessPoint.SECURITY_OWE; } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index fd25f7d9bb8..b16d90088cf 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -324,7 +324,7 @@ public class WifiConfigControllerTest { WifiManager wifiManager = mock(WifiManager.class); when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible); when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible); - when(wifiManager.isOweSupported()).thenReturn(oweVisible); + when(wifiManager.isEnhancedOpenSupported()).thenReturn(oweVisible); mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, WifiConfigUiBase.MODE_MODIFY, wifiManager);