Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf32a1da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: add SAE-PK feature querying API" am: 90c465d6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12965744

Change-Id: I5834902c154aa393b96541f66c5d47b09ba1d144
parents b8dc9b84 90c465d6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

wifi/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

wifi/java/android/net/wifi/WifiManager.java

+10 −0
Original line number Diff line number Diff line
@@ -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