diff options
| author | 2020-11-06 20:04:15 +0000 | |
|---|---|---|
| committer | 2020-11-06 20:04:15 +0000 | |
| commit | 90c465d6d17885b201435f943a5d621ab4037bc0 (patch) | |
| tree | 4a863ae0c1aed2ca2929fe5ba74177ef17a3cc53 | |
| parent | 457cdcc29ebf712d8079639679e9b8c4b37871e4 (diff) | |
| parent | 8f1d70ea5d361fba8a53c8cdd511f62c1e9edcea (diff) | |
Merge "wifi: add SAE-PK feature querying API"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | wifi/api/current.txt | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
3 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 118836ec5647..80de3c77c9fd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31657,6 +31657,7 @@ package android.net.wifi { method public boolean isWapiSupported(); method public boolean isWifiEnabled(); method public boolean isWifiStandardSupported(int); + method public boolean isWpa3ApValidationSupported(); method public boolean isWpa3SaeSupported(); method public boolean isWpa3SuiteBSupported(); method @Deprecated public boolean pingSupplicant(); diff --git a/wifi/api/current.txt b/wifi/api/current.txt index 4c16cf492e39..3b8c33cae516 100644 --- a/wifi/api/current.txt +++ b/wifi/api/current.txt @@ -344,6 +344,7 @@ package android.net.wifi { method public boolean isWapiSupported(); method public boolean isWifiEnabled(); method public boolean isWifiStandardSupported(int); + method public boolean isWpa3ApValidationSupported(); method public boolean isWpa3SaeSupported(); method public boolean isWpa3SuiteBSupported(); method @Deprecated public boolean pingSupplicant(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 8ee08f1610d6..ef55a56a494c 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -2425,6 +2425,9 @@ public class WifiManager { /** @hide */ public static final long WIFI_FEATURE_FILS_SHA384 = 0x8000000000L; // FILS-SHA384 + /** @hide */ + public static final long WIFI_FEATURE_SAE_PK = 0x10000000000L; // SAE-PK + private long getSupportedFeatures() { try { return mService.getSupportedFeatures(); @@ -5330,6 +5333,13 @@ public class WifiManager { } /** + * @return true if this device supports WPA3 AP validation. + */ + public boolean isWpa3ApValidationSupported() { + return isFeatureSupported(WIFI_FEATURE_SAE_PK); + } + + /** * Gets the factory Wi-Fi MAC addresses. * @return Array of String representing Wi-Fi MAC addresses sorted lexically or an empty Array * if failed. |