diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl index 9c6ad267f3..10c96749c9 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl @@ -63,4 +63,6 @@ parcelable RttResult { byte r2iTxLtfRepetitionCount; long ntbMinMeasurementTime; long ntbMaxMeasurementTime; + byte numTxSpatialStreams; + byte numRxSpatialStreams; } diff --git a/wifi/aidl/android/hardware/wifi/RttResult.aidl b/wifi/aidl/android/hardware/wifi/RttResult.aidl index ab9abb550e..438bc0a0a8 100644 --- a/wifi/aidl/android/hardware/wifi/RttResult.aidl +++ b/wifi/aidl/android/hardware/wifi/RttResult.aidl @@ -148,11 +148,15 @@ parcelable RttResult { /** * Multiple transmissions of HE-LTF symbols in an HE (I2R) Ranging NDP. An HE-LTF repetition * value of 1 indicates no repetitions. + * + * Note: A required field for IEEE 802.11az result. */ byte i2rTxLtfRepetitionCount; /** * Multiple transmissions of HE-LTF symbols in an HE (R2I) Ranging NDP. An HE-LTF repetition * value of 1 indicates no repetitions. + * + * Note: A required field for IEEE 802.11az result. */ byte r2iTxLtfRepetitionCount; /** @@ -168,6 +172,8 @@ parcelable RttResult { * |RttResult.timestamp|. * * Reference: IEEE Std 802.11az-2022 spec, section 9.4.2.298 Ranging Parameters element. + * + * Note: A required field for IEEE 802.11az result. */ long ntbMinMeasurementTime; /** @@ -183,6 +189,22 @@ parcelable RttResult { * non-TB ranging negotiation. * * Reference: IEEE Std 802.11az-2022 spec, section 9.4.2.298 Ranging Parameters element. + * + * Note: A required field for IEEE 802.11az result. */ long ntbMaxMeasurementTime; + /** + * Number of transmit space-time streams used. Value is in the range 1 to 8. + * + * Note: Maximum limit is ultimately defined by the number of antennas that can be supported. + * A required field for IEEE 802.11az result. + */ + byte numTxSpatialStreams; + /** + * Number of receive space-time streams used. Value is in the range 1 to 8. + * + * Note: Maximum limit is ultimately defined by the number of antennas that can be supported. + * A required field for IEEE 802.11az result. + */ + byte numRxSpatialStreams; } diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index 836ce1a9b6..0f0c77e171 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -2995,6 +2995,8 @@ bool convertLegacyVectorOfRttResultToAidl( aidl_result.r2iTxLtfRepetitionCount = 0; aidl_result.ntbMinMeasurementTime = 0; aidl_result.ntbMaxMeasurementTime = 0; + aidl_result.numTxSpatialStreams = 0; + aidl_result.numRxSpatialStreams = 0; aidl_results->push_back(aidl_result); } return true; @@ -3019,6 +3021,8 @@ bool convertLegacyVectorOfRttResultV2ToAidl( aidl_result.r2iTxLtfRepetitionCount = 0; aidl_result.ntbMinMeasurementTime = 0; aidl_result.ntbMaxMeasurementTime = 0; + aidl_result.numTxSpatialStreams = 0; + aidl_result.numRxSpatialStreams = 0; aidl_results->push_back(aidl_result); } return true; @@ -3044,6 +3048,8 @@ bool convertLegacyVectorOfRttResultV3ToAidl( aidl_result.r2iTxLtfRepetitionCount = legacy_result->r2i_tx_ltf_repetition_count; aidl_result.ntbMinMeasurementTime = legacy_result->ntb_min_measurement_time; aidl_result.ntbMaxMeasurementTime = legacy_result->ntb_max_measurement_time; + aidl_result.numTxSpatialStreams = legacy_result->num_tx_sts; + aidl_result.numRxSpatialStreams = legacy_result->num_rx_sts; aidl_results->push_back(aidl_result); } return true;