Merge "Fix multi-link llstat parsing in wifi legacy hal"
diff --git a/wifi/aidl/default/wifi_legacy_hal.cpp b/wifi/aidl/default/wifi_legacy_hal.cpp
index 796098d..e3a34a9 100644
--- a/wifi/aidl/default/wifi_legacy_hal.cpp
+++ b/wifi/aidl/default/wifi_legacy_hal.cpp
@@ -754,7 +754,7 @@
// Copies wifi_peer_info* to vector<WifiPeerInfo> and returns poiner to next element.
wifi_peer_info* WifiLegacyHal::copyPeerInfo(wifi_peer_info* peer_ptr,
- std::vector<WifiPeerInfo> peers) {
+ std::vector<WifiPeerInfo>& peers) {
WifiPeerInfo peer;
peer.peer_info = *peer_ptr;
if (peer_ptr->num_rate > 0) {
@@ -770,7 +770,7 @@
}
// Copies wifi_link_stat* to vector<LinkStats> and returns poiner to next element.
wifi_link_stat* WifiLegacyHal::copyLinkStat(wifi_link_stat* stat_ptr,
- std::vector<LinkStats> stats) {
+ std::vector<LinkStats>& stats) {
LinkStats linkStat;
linkStat.stat = *stat_ptr;
wifi_peer_info* l_peer_info_stats_ptr = stat_ptr->peer_info;
diff --git a/wifi/aidl/default/wifi_legacy_hal.h b/wifi/aidl/default/wifi_legacy_hal.h
index 85a8ac4..f076ce6 100644
--- a/wifi/aidl/default/wifi_legacy_hal.h
+++ b/wifi/aidl/default/wifi_legacy_hal.h
@@ -792,8 +792,8 @@
// Handles wifi (error) status of Virtual interface create/delete
wifi_error handleVirtualInterfaceCreateOrDeleteStatus(const std::string& ifname,
wifi_error status);
- wifi_link_stat* copyLinkStat(wifi_link_stat* stat_ptr, std::vector<LinkStats> stats);
- wifi_peer_info* copyPeerInfo(wifi_peer_info* peer_ptr, std::vector<WifiPeerInfo> peers);
+ wifi_link_stat* copyLinkStat(wifi_link_stat* stat_ptr, std::vector<LinkStats>& stats);
+ wifi_peer_info* copyPeerInfo(wifi_peer_info* peer_ptr, std::vector<WifiPeerInfo>& peers);
// Global function table of legacy HAL.
wifi_hal_fn global_func_table_;