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

Commit 13f53a63 authored by Mahesh KKV's avatar Mahesh KKV Committed by Android (Google) Code Review
Browse files

Merge "Add secure HE-LTF protocol version to capabilities" into main

parents 8ed5c3f9 4f0c2b0e

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,4 +51,5 @@ parcelable RttCapabilities { 
  long cipherSuitesSupported;

  long cipherSuitesSupported;

  boolean secureHeLtfSupported;

  boolean secureHeLtfSupported;

  boolean rangingFrameProtectionSupported;

  boolean rangingFrameProtectionSupported;

  int maxSupportedSecureHeLtfProtocolVersion;

}
 
}

wifi/aidl/android/hardware/wifi/RttCapabilities.aidl

+4 −0
Original line number Original line Diff line number Diff line
@@ -100,4 +100,8 @@ parcelable RttCapabilities { 
     * Whether frame protection for ranging is supported.

     * Whether frame protection for ranging is supported.

     */

     */

    boolean rangingFrameProtectionSupported;

    boolean rangingFrameProtectionSupported;

    /**

     * Maximum supported secure HE-LTF protocol version.

     */

    int maxSupportedSecureHeLtfProtocolVersion;

}
 
}

wifi/legacy_headers/include/hardware_legacy/rtt.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -257,7 +257,7 @@ typedef struct { 
typedef struct {

typedef struct {

    wifi_rtt_result_v3 rtt_result_v3;

    wifi_rtt_result_v3 rtt_result_v3;

    bool is_ranging_protection_enabled;

    bool is_ranging_protection_enabled;

    bool is_secure_ltf_enabled;

    bool is_secure_he_ltf_enabled;

    wifi_rtt_akm base_akm;

    wifi_rtt_akm base_akm;

    wifi_rtt_cipher_suite cipher_suite;

    wifi_rtt_cipher_suite cipher_suite;

    int secure_he_ltf_protocol_version;

    int secure_he_ltf_protocol_version;
@@ -395,7 +395,9 @@ typedef struct { 
/* RTT Capabilities v4 (11az secure support) */

/* RTT Capabilities v4 (11az secure support) */

typedef struct {

typedef struct {

    wifi_rtt_capabilities_v3 rtt_capab_v3;

    wifi_rtt_capabilities_v3 rtt_capab_v3;

    bool secure_ltf_supported;

    bool secure_he_ltf_supported;

    int max_supported_secure_he_ltf_protocol_ver;  // Maximum supported secure HE-LTF protocol

                                                   // version.

    bool ranging_fame_protection_supported;

    bool ranging_fame_protection_supported;

    wifi_rtt_akm supported_akms;  // Bitmap of wifi_rtt_akm values indicating the set of supported

    wifi_rtt_akm supported_akms;  // Bitmap of wifi_rtt_akm values indicating the set of supported

                                  // AKMs.

                                  // AKMs.