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

Commit 3bdac177 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Supplicant: Add support to configure and indicate additional vendor data" into main

parents f1c5aa2b f503a6f1

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ConnectionCapabilities.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ parcelable ConnectionCapabilities { 
  int maxNumberRxSpatialStreams;

  android.hardware.wifi.supplicant.LegacyMode legacyMode;

  boolean apTidToLinkMapNegotiationSupported;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaNetwork.aidl

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ interface ISupplicantStaNetwork { 
  void setMinimumTlsVersionEapPhase1Param(android.hardware.wifi.supplicant.TlsVersion tlsVersion);

  void setStrictConservativePeerMode(in boolean enable);

  void disableEht();

  void setVendorData(in android.hardware.wifi.common.OuiKeyedData[] vendorData);

  const int SSID_MAX_LEN_IN_BYTES = 32;

  const int PSK_PASSPHRASE_MIN_LEN_IN_BYTES = 8;

  const int PSK_PASSPHRASE_MAX_LEN_IN_BYTES = 63;

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ConnectionCapabilities.aidl

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.wifi.supplicant;



import android.hardware.wifi.common.OuiKeyedData;

import android.hardware.wifi.supplicant.LegacyMode;

import android.hardware.wifi.supplicant.WifiTechnology;
@@ -48,4 +49,9 @@ parcelable ConnectionCapabilities { 
     * Indicates the AP support for TID-to-link mapping negotiation.

     */

    boolean apTidToLinkMapNegotiationSupported;

    /**

     * Additional vendor-specific data. Null value indicates

     * that no vendor data is provided.

     */

    @nullable OuiKeyedData[] vendorData;

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaNetwork.aidl

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.wifi.supplicant;



import android.hardware.wifi.common.OuiKeyedData;

import android.hardware.wifi.supplicant.AuthAlgMask;

import android.hardware.wifi.supplicant.DppConnectionKeys;

import android.hardware.wifi.supplicant.EapMethod;
@@ -1153,4 +1154,15 @@ interface ISupplicantStaNetwork { 
     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void disableEht();



    /**

     * Set additional vendor-provided configuration data.

     *

     * @param vendorData List of |OuiKeyedData| containing the vendor-provided

     *         configuration data.

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setVendorData(in OuiKeyedData[] vendorData);

}