commit 0da299716309058488343bbd940b8310a83c152a
author Mahesh KKV <maheshkkv@google.com> Tue Dec 06 21:11:50 2022 -0800
committer Sunil Ravi <sunilravi@google.com> Fri Dec 16 17:54:51 2022 +0000
tree 5a149dc9eadfbba1f7874be6b4ebedfc682782af
parent 5f30d333d2c4bd021de7d0c1b4eddb061cf1d314

wifi: Add radio_id and frequency to StaLinkLayerLinkStats

Bug: 258013268
Test: m android.hardware.wifi-update-api
Change-Id: I725144033cd33e59c201e459e036c2008a8cca58

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 fe7579b..3087d66 100644
--- a/wifi/aidl/default/aidl_struct_util.cpp
+++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -951,6 +951,8 @@
     for (const auto& link : legacy_ml_stats.links) {
         StaLinkLayerLinkStats linkStats = {};
         linkStats.linkId = link.stat.link_id;
+        linkStats.radioId = link.stat.radio;
+        linkStats.frequencyMhz = link.stat.frequency;
         linkStats.beaconRx = link.stat.beacon_rx;
         linkStats.avgRssiMgmt = link.stat.rssi_mgmt;
         linkStats.wmeBePktStats.rxMpdu = link.stat.ac[legacy_hal::WIFI_AC_BE].rx_mpdu;

wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp

diff --git a/wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp b/wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp
index c2de012..df788b8 100644
--- a/wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp
+++ b/wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp
@@ -125,6 +125,9 @@
         link.peers.push_back(legacy_hal::WifiPeerInfo{});
         link.peers.push_back(legacy_hal::WifiPeerInfo{});
         link.stat.beacon_rx = rand();
+        link.stat.link_id = rand() % 15;
+        link.stat.radio = rand() % 4;
+        link.stat.frequency = rand();
         link.stat.rssi_mgmt = rand();
         link.stat.ac[legacy_hal::WIFI_AC_BE].rx_mpdu = rand();
         link.stat.ac[legacy_hal::WIFI_AC_BE].tx_mpdu = rand();
@@ -227,6 +230,8 @@
     int l = 0;
     for (legacy_hal::LinkStats& link : legacy_ml_stats.links) {
         EXPECT_EQ(link.stat.link_id, (uint8_t)converted.iface.links[l].linkId);
+        EXPECT_EQ(link.stat.radio, converted.iface.links[l].radioId);
+        EXPECT_EQ(link.stat.frequency, (uint32_t)converted.iface.links[l].frequencyMhz);
         EXPECT_EQ(link.stat.beacon_rx, (uint32_t)converted.iface.links[l].beaconRx);
         EXPECT_EQ(link.stat.rssi_mgmt, converted.iface.links[l].avgRssiMgmt);
         EXPECT_EQ(link.stat.ac[legacy_hal::WIFI_AC_BE].rx_mpdu,