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

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

Merge "Comment fixes for the Wifi Vendor HAL." into udc-dev

parents 08212492 0c642ecd

wifi/aidl/android/hardware/wifi/MacAddress.aidl

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ package android.hardware.wifi; 
 * Byte array representing a Mac Address. Use when we need to

 * pass an array of Mac Addresses to a method, as variable-sized

 * 2D arrays are not supported in AIDL.

 *

 * TODO (b/210705533): Replace this type with a 2D byte array.

 */

@VintfStability

parcelable MacAddress {

wifi/aidl/android/hardware/wifi/NanMatchInd.aidl

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ parcelable NanMatchInd { 
    NanRangingIndication rangingIndicationType;

    /**

     * Security Context Identifier attribute contains PMKID. Shall be included in NDP setup and

     * response messages. Security Context Identifie identifies the Security Context. For NAN

     * response messages. Security Context Identifier identifies the Security Context. For NAN

     * Shared Key Cipher Suite, this field contains the 16 octet PMKID identifying the PMK used for

     * setting up the Secure Data Path.

     */

wifi/aidl/android/hardware/wifi/NanPairingAkm.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
package android.hardware.wifi;



/**

 * THe AKM used of NAN pairing

 * The AKM used in the NAN pairing.

 */

@VintfStability @Backing(type="int") enum NanPairingAkm { SAE = 0, PASN=1 }

wifi/aidl/android/hardware/wifi/NpkSecurityAssociation.aidl

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.hardware.wifi.NanCipherSuiteType; 
import android.hardware.wifi.NanPairingAkm;



/**

 * The security sssociation info after Aware Pairing setup.

 * The security association info after Aware Pairing setup.

 */

@VintfStability

parcelable NpkSecurityAssociation {
@@ -37,7 +37,7 @@ parcelable NpkSecurityAssociation { 
     */

    byte[32] npk;

    /**

     * The AKM is used for key exchange in this security sssociation

     * The AKM is used for key exchange in this security association

     */

    NanPairingAkm akm;

    /**

wifi/aidl/android/hardware/wifi/Ssid.aidl

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ package android.hardware.wifi; 
 * Byte array representing an Ssid. Use when we need to

 * pass an array of Ssid's to a method, as variable-sized

 * 2D arrays are not supported in AIDL.

 *

 * TODO (b/210705533): Replace this type with a 2D byte array.

 */

@VintfStability

parcelable Ssid {