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

Commit 54cfa4f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Incorporate Native API council feedback into the Wifi HALs." into main

parents 12999026 334419a5

wifi/aidl/android/hardware/wifi/PasnConfig.aidl

+4 −3
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ package android.hardware.wifi; 
@VintfStability

parcelable PasnConfig {

    /**

     * Base Authentication and Key Management (AKM) protocol used for PASN as defined in |Akm|.

     * Base Authentication and Key Management (AKM) protocol used for PASN. Represented as

     * at bitmap of |Akm|.

     */

    long baseAkm;

    /**

     * Pairwise cipher suite used for the PTKSA (Pairwise Transient Key Security Association)

     * as defined in |CipherSuite|

     * Pairwise cipher suite used for the PTKSA (Pairwise Transient Key Security Association).

     * Represented as a bitmap of |CipherSuite|.

     */

    long cipherSuite;

    /**

wifi/aidl/android/hardware/wifi/RttResult.aidl

+4 −3
Original line number Diff line number Diff line
@@ -222,12 +222,13 @@ parcelable RttResult { 
     */

    boolean isSecureLtfEnabled;

    /**

     * Base Authentication and Key Management (AKM) protocol used for PASN as defined in |Akm|.

     * Base Authentication and Key Management (AKM) protocol used for PASN. Represented as

     * at bitmap of |Akm|.

     */

    long baseAkm;

    /**

     * Pairwise cipher suite used for the PTKSA (Pairwise Transient Key Security Association)

     * as defined in |CipherSuite|

     * Pairwise cipher suite used for the PTKSA (Pairwise Transient Key Security Association).

     * Represented as a bitmap of |CipherSuite|.

     */

    long cipherSuite;

    /**

wifi/hostapd/aidl/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ aidl_interface { 
            ],

            min_sdk_version: "30",

            lint: {

                baseline_filename: "lint-baseline.xml",

                // Disable linter to avoid error about fixed size arrays.

                // Interface will only be accessed on devices >= T.

                enabled: false,

            },

        },

        ndk: {

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/ApInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -41,5 +41,5 @@ parcelable ApInfo { 
  android.hardware.wifi.hostapd.Generation generation;

  byte[] apIfaceInstanceMacAddress;

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

  @nullable byte[] mldMacAddress;

  @nullable byte[6] mldMacAddress;

}

wifi/hostapd/aidl/android/hardware/wifi/hostapd/ApInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -67,5 +67,5 @@ parcelable ApInfo { 
    /**

     * MAC Address of the multiple link device (MLD) which apIfaceInstance is associated with.

     */

    @nullable byte[] mldMacAddress;

    @nullable byte[6] mldMacAddress;

}