Merge "[OWE] Rename isOweSupported to isEnhancedOpenSupported"
diff --git a/api/current.txt b/api/current.txt
index 6de1383..4732405 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29980,8 +29980,8 @@
method public boolean is5GHzBandSupported();
method @Deprecated public boolean isDeviceToApRttSupported();
method public boolean isEasyConnectSupported();
+ method public boolean isEnhancedOpenSupported();
method public boolean isEnhancedPowerReportingSupported();
- method public boolean isOweSupported();
method public boolean isP2pSupported();
method public boolean isPreferredNetworkOffloadSupported();
method @Deprecated public boolean isScanAlwaysAvailable();
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 8ea0f4b..9ce6b34 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -1068,7 +1068,7 @@
}
// Get and cache advanced capabilities
- final boolean isOweSupported = mWifiManager.isOweSupported();
+ final boolean isOweSupported = mWifiManager.isEnhancedOpenSupported();
final boolean isSaeSupported = mWifiManager.isWpa3SaeSupported();
final boolean isSuiteBSupported = mWifiManager.isWpa3SuiteBSupported();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 5ca30fc..d4a5b46 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -4524,7 +4524,7 @@
/**
* @return true if this device supports Wi-Fi Enhanced Open (OWE)
*/
- public boolean isOweSupported() {
+ public boolean isEnhancedOpenSupported() {
return isFeatureSupported(WIFI_FEATURE_OWE);
}