commit 6339cde065062e81196353c491fd1ddd6fccf091
author maheshkkv <maheshkkv@google.com> Thu Dec 14 09:58:57 2023 -0800
committer maheshkkv <maheshkkv@google.com> Thu Dec 14 12:46:28 2023 -0800
tree 4281c7756c296b42e8f4e4146b3bde53e6cd33e2
parent 19f723c2f984b6ad8d40e09dc08971762fb24e31

Fix 11az non-TB measurment time unit

Bug: 295619650
Test: m
Change-Id: I8a0cc8d59db939cfc5adfd6e3ce5d6817db0a2f8

wifi/aidl/default/aidl_struct_util.cpp

diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp
index 42f484b..7e7929d 100644
--- a/wifi/aidl/default/aidl_struct_util.cpp
+++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -2741,8 +2741,8 @@
     if (!convertAidlRttConfigToLegacy(aidl_config, &(legacy_config->rtt_config))) {
         return false;
     }
-    legacy_config->ntb_min_measurement_time_millis = aidl_config.ntbMinMeasurementTimeMillis;
-    legacy_config->ntb_max_measurement_time_millis = aidl_config.ntbMaxMeasurementTimeMillis;
+    legacy_config->ntb_min_measurement_time = aidl_config.ntbMinMeasurementTime;
+    legacy_config->ntb_max_measurement_time = aidl_config.ntbMaxMeasurementTime;
     return true;
 }
 
@@ -2993,8 +2993,8 @@
         aidl_result.packetBw = RttBw::BW_UNSPECIFIED;
         aidl_result.i2rTxLtfRepetitionCount = 0;
         aidl_result.r2iTxLtfRepetitionCount = 0;
-        aidl_result.ntbMinMeasurementTimeMillis = 0;
-        aidl_result.ntbMaxMeasurementTimeMillis = 0;
+        aidl_result.ntbMinMeasurementTime = 0;
+        aidl_result.ntbMaxMeasurementTime = 0;
         aidl_results->push_back(aidl_result);
     }
     return true;
@@ -3017,8 +3017,8 @@
         aidl_result.packetBw = convertLegacyRttBwToAidl(legacy_result->packet_bw);
         aidl_result.i2rTxLtfRepetitionCount = 0;
         aidl_result.r2iTxLtfRepetitionCount = 0;
-        aidl_result.ntbMinMeasurementTimeMillis = 0;
-        aidl_result.ntbMaxMeasurementTimeMillis = 0;
+        aidl_result.ntbMinMeasurementTime = 0;
+        aidl_result.ntbMaxMeasurementTime = 0;
         aidl_results->push_back(aidl_result);
     }
     return true;
@@ -3042,8 +3042,8 @@
         aidl_result.packetBw = convertLegacyRttBwToAidl(legacy_result->rtt_result.packet_bw);
         aidl_result.i2rTxLtfRepetitionCount = legacy_result->i2r_tx_ltf_repetition_count;
         aidl_result.r2iTxLtfRepetitionCount = legacy_result->r2i_tx_ltf_repetition_count;
-        aidl_result.ntbMinMeasurementTimeMillis = legacy_result->ntb_min_measurement_time_millis;
-        aidl_result.ntbMaxMeasurementTimeMillis = legacy_result->ntb_max_measurement_time_millis;
+        aidl_result.ntbMinMeasurementTime = legacy_result->ntb_min_measurement_time;
+        aidl_result.ntbMaxMeasurementTime = legacy_result->ntb_max_measurement_time;
         aidl_results->push_back(aidl_result);
     }
     return true;