From 8f1d70ea5d361fba8a53c8cdd511f62c1e9edcea Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Fri, 30 Oct 2020 11:09:24 +0800 Subject: [PATCH] wifi: add SAE-PK feature querying API Bug: 160642415 Test: build Change-Id: I2a729185897660d3406ca5eb8a86984ee6582325 --- api/current.txt | 1 + wifi/api/current.txt | 1 + wifi/java/android/net/wifi/WifiManager.java | 10 ++++++++++ 3 files changed, 12 insertions(+) diff --git a/api/current.txt b/api/current.txt index 6459eb4c548aa..6c06a209cf8f3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31642,6 +31642,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 d5ef703253cba..5e4ae1af55a6e 100644 --- a/wifi/api/current.txt +++ b/wifi/api/current.txt @@ -342,6 +342,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 8ee08f1610d6b..ef55a56a494c5 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(); @@ -5329,6 +5332,13 @@ public class WifiManager { return isFeatureSupported(WIFI_FEATURE_WAPI); } + /** + * @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