Merge changes from topic "Wi-Fi7: MLO Stats" (dce87aa9) · Commits · e / os / android_hardware_interfaces

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

+1 −12

Original line number	Diff line number	Diff line
		@@ -34,16 +34,5 @@
		package android.hardware.wifi;
		@VintfStability
		parcelable StaLinkLayerIfaceStats {
		int beaconRx;
		int avgRssiMgmt;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeBePktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeBkPktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeViPktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeVoPktStats;
		byte timeSliceDutyCycleInPercent;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeBeContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeBkContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeViContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeVoContentionTimeStats;
		android.hardware.wifi.StaPeerInfo[] peers;
		android.hardware.wifi.StaLinkLayerLinkStats[] links;
		}

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

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.wifi;
		@VintfStability
		parcelable StaLinkLayerLinkStats {
		int linkId;
		int beaconRx;
		int avgRssiMgmt;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeBePktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeBkPktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeViPktStats;
		android.hardware.wifi.StaLinkLayerIfacePacketStats wmeVoPktStats;
		byte timeSliceDutyCycleInPercent;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeBeContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeBkContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeViContentionTimeStats;
		android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats wmeVoContentionTimeStats;
		android.hardware.wifi.StaPeerInfo[] peers;
		}

wifi/aidl/android/hardware/wifi/StaLinkLayerIfaceStats.aidl

+4 −55

Original line number	Diff line number	Diff line
		@@ -16,64 +16,13 @@

		package android.hardware.wifi;

		import android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats;
		import android.hardware.wifi.StaLinkLayerIfacePacketStats;
		import android.hardware.wifi.StaPeerInfo;
		import android.hardware.wifi.StaLinkLayerLinkStats;

		/**
		* Iface statistics for the current connection.
		* Iface statistics for the current connection. Current connection may have
		* single or multiple links.
		*/
		@VintfStability
		parcelable StaLinkLayerIfaceStats {
		/**
		* Number beacons received from the connected AP.
		*/
		int beaconRx;
		/**
		* Access Point Beacon and Management frames RSSI (averaged).
		*/
		int avgRssiMgmt;
		/**
		* WME Best Effort Access Category packet counters.
		*/
		StaLinkLayerIfacePacketStats wmeBePktStats;
		/**
		* WME Background Access Category packet counters.
		*/
		StaLinkLayerIfacePacketStats wmeBkPktStats;
		/**
		* WME Video Access Category packet counters.
		*/
		StaLinkLayerIfacePacketStats wmeViPktStats;
		/**
		* WME Voice Access Category packet counters.
		*/
		StaLinkLayerIfacePacketStats wmeVoPktStats;
		/**
		* Duty cycle for the iface.
		* If this iface is being served using time slicing on a radio with one or more ifaces
		* (i.e MCC), then the duty cycle assigned to this iface in %.
		* If not using time slicing (i.e SCC or DBS), set to 100.
		*/
		byte timeSliceDutyCycleInPercent;
		/**
		* WME Best Effort (BE) Access Category (AC) contention time statistics.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeBeContentionTimeStats;
		/**
		* WME Background (BK) Access Category (AC) contention time statistics.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeBkContentionTimeStats;
		/**
		* WME Video (VI) Access Category (AC) contention time statistics.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeViContentionTimeStats;
		/**
		* WME Voice (VO) Access Category (AC) contention time statistics.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeVoContentionTimeStats;
		/**
		* Per peer statistics.
		*/
		StaPeerInfo[] peers;
		StaLinkLayerLinkStats[] links;
		}

wifi/aidl/android/hardware/wifi/StaLinkLayerLinkStats.aidl

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.wifi;

		import android.hardware.wifi.StaLinkLayerIfaceContentionTimeStats;
		import android.hardware.wifi.StaLinkLayerIfacePacketStats;
		import android.hardware.wifi.StaPeerInfo;

		/**
		* Per Link statistics for the current connection. For MLO, this is
		* the statistics for one link in the connection.
		*/
		@VintfStability
		parcelable StaLinkLayerLinkStats {
		/**
		* Identifier for the link within MLO. For single link operation this field
		* is not relevant and can be set to 0.
		*/
		int linkId;
		/**
		* Number of beacons received from the connected AP on the link.
		*/
		int beaconRx;
		/**
		* Access Point Beacon and Management frames RSSI (averaged) on the link.
		*/
		int avgRssiMgmt;
		/**
		* WME Best Effort Access Category packet counters on the link.
		*/
		StaLinkLayerIfacePacketStats wmeBePktStats;
		/**
		* WME Background Access Category packet counters on the link.
		*/
		StaLinkLayerIfacePacketStats wmeBkPktStats;
		/**
		* WME Video Access Category packet counters on the link.
		*/
		StaLinkLayerIfacePacketStats wmeViPktStats;
		/**
		* WME Voice Access Category packet counters on the link.
		*/
		StaLinkLayerIfacePacketStats wmeVoPktStats;
		/**
		* Duty cycle for the link.
		* If this link is being served using time slicing on a radio with one or
		* more links then the duty cycle assigned to this link in %. If not using
		* time slicing, set to 100.
		*/
		byte timeSliceDutyCycleInPercent;
		/**
		* WME Best Effort (BE) Access Category (AC) contention time statistics on
		* the link.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeBeContentionTimeStats;
		/**
		* WME Background (BK) Access Category (AC) contention time statistics on
		* the link.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeBkContentionTimeStats;
		/**
		* WME Video (VI) Access Category (AC) contention time statistics on the
		* link.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeViContentionTimeStats;
		/**
		* WME Voice (VO) Access Category (AC) contention time statistics on the
		* link.
		*/
		StaLinkLayerIfaceContentionTimeStats wmeVoContentionTimeStats;
		/**
		* Per peer statistics for the link.
		*/
		StaPeerInfo[] peers;
		}

wifi/aidl/default/aidl_struct_util.cpp

+132 −41

Original line number	Diff line number	Diff line
		@@ -940,69 +940,158 @@ bool convertLegacyLinkLayerRadioStatsToAidl(
		return true;
		}

		bool convertLegacyLinkLayerMlStatsToAidl(const legacy_hal::LinkLayerMlStats& legacy_ml_stats,
		StaLinkLayerStats* aidl_stats) {
		if (!aidl_stats) {
		return false;
		}
		*aidl_stats = {};
		std::vector<StaLinkLayerLinkStats> links;
		// Iterate over each links
		for (const auto& link : legacy_ml_stats.links) {
		StaLinkLayerLinkStats linkStats = {};
		linkStats.linkId = link.stat.link_id;
		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;
		linkStats.wmeBePktStats.txMpdu = link.stat.ac[legacy_hal::WIFI_AC_BE].tx_mpdu;
		linkStats.wmeBePktStats.lostMpdu = link.stat.ac[legacy_hal::WIFI_AC_BE].mpdu_lost;
		linkStats.wmeBePktStats.retries = link.stat.ac[legacy_hal::WIFI_AC_BE].retries;
		linkStats.wmeBeContentionTimeStats.contentionTimeMinInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BE].contention_time_min;
		linkStats.wmeBeContentionTimeStats.contentionTimeMaxInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BE].contention_time_max;
		linkStats.wmeBeContentionTimeStats.contentionTimeAvgInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BE].contention_time_avg;
		linkStats.wmeBeContentionTimeStats.contentionNumSamples =
		link.stat.ac[legacy_hal::WIFI_AC_BE].contention_num_samples;
		linkStats.wmeBkPktStats.rxMpdu = link.stat.ac[legacy_hal::WIFI_AC_BK].rx_mpdu;
		linkStats.wmeBkPktStats.txMpdu = link.stat.ac[legacy_hal::WIFI_AC_BK].tx_mpdu;
		linkStats.wmeBkPktStats.lostMpdu = link.stat.ac[legacy_hal::WIFI_AC_BK].mpdu_lost;
		linkStats.wmeBkPktStats.retries = link.stat.ac[legacy_hal::WIFI_AC_BK].retries;
		linkStats.wmeBkContentionTimeStats.contentionTimeMinInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BK].contention_time_min;
		linkStats.wmeBkContentionTimeStats.contentionTimeMaxInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BK].contention_time_max;
		linkStats.wmeBkContentionTimeStats.contentionTimeAvgInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_BK].contention_time_avg;
		linkStats.wmeBkContentionTimeStats.contentionNumSamples =
		link.stat.ac[legacy_hal::WIFI_AC_BK].contention_num_samples;
		linkStats.wmeViPktStats.rxMpdu = link.stat.ac[legacy_hal::WIFI_AC_VI].rx_mpdu;
		linkStats.wmeViPktStats.txMpdu = link.stat.ac[legacy_hal::WIFI_AC_VI].tx_mpdu;
		linkStats.wmeViPktStats.lostMpdu = link.stat.ac[legacy_hal::WIFI_AC_VI].mpdu_lost;
		linkStats.wmeViPktStats.retries = link.stat.ac[legacy_hal::WIFI_AC_VI].retries;
		linkStats.wmeViContentionTimeStats.contentionTimeMinInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VI].contention_time_min;
		linkStats.wmeViContentionTimeStats.contentionTimeMaxInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VI].contention_time_max;
		linkStats.wmeViContentionTimeStats.contentionTimeAvgInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VI].contention_time_avg;
		linkStats.wmeViContentionTimeStats.contentionNumSamples =
		link.stat.ac[legacy_hal::WIFI_AC_VI].contention_num_samples;
		linkStats.wmeVoPktStats.rxMpdu = link.stat.ac[legacy_hal::WIFI_AC_VO].rx_mpdu;
		linkStats.wmeVoPktStats.txMpdu = link.stat.ac[legacy_hal::WIFI_AC_VO].tx_mpdu;
		linkStats.wmeVoPktStats.lostMpdu = link.stat.ac[legacy_hal::WIFI_AC_VO].mpdu_lost;
		linkStats.wmeVoPktStats.retries = link.stat.ac[legacy_hal::WIFI_AC_VO].retries;
		linkStats.wmeVoContentionTimeStats.contentionTimeMinInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VO].contention_time_min;
		linkStats.wmeVoContentionTimeStats.contentionTimeMaxInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VO].contention_time_max;
		linkStats.wmeVoContentionTimeStats.contentionTimeAvgInUsec =
		link.stat.ac[legacy_hal::WIFI_AC_VO].contention_time_avg;
		linkStats.wmeVoContentionTimeStats.contentionNumSamples =
		link.stat.ac[legacy_hal::WIFI_AC_VO].contention_num_samples;
		linkStats.timeSliceDutyCycleInPercent = link.stat.time_slicing_duty_cycle_percent;
		// peer info legacy_stats conversion.
		std::vector<StaPeerInfo> aidl_peers_info_stats;
		for (const auto& legacy_peer_info_stats : link.peers) {
		StaPeerInfo aidl_peer_info_stats;
		if (!convertLegacyPeerInfoStatsToAidl(legacy_peer_info_stats, &aidl_peer_info_stats)) {
		return false;
		}
		aidl_peers_info_stats.push_back(aidl_peer_info_stats);
		}
		linkStats.peers = aidl_peers_info_stats;
		// Push link stats to aidl stats.
		links.push_back(linkStats);
		}
		aidl_stats->iface.links = links;
		// radio legacy_stats conversion.
		std::vector<StaLinkLayerRadioStats> aidl_radios_stats;
		for (const auto& legacy_radio_stats : legacy_ml_stats.radios) {
		StaLinkLayerRadioStats aidl_radio_stats;
		if (!convertLegacyLinkLayerRadioStatsToAidl(legacy_radio_stats, &aidl_radio_stats)) {
		return false;
		}
		aidl_radios_stats.push_back(aidl_radio_stats);
		}
		aidl_stats->radios = aidl_radios_stats;
		aidl_stats->timeStampInMs = ::android::uptimeMillis();

		return true;
		}

		bool convertLegacyLinkLayerStatsToAidl(const legacy_hal::LinkLayerStats& legacy_stats,
		StaLinkLayerStats* aidl_stats) {
		if (!aidl_stats) {
		return false;
		}
		*aidl_stats = {};
		std::vector<StaLinkLayerLinkStats> links;
		StaLinkLayerLinkStats linkStats = {};
		// iface legacy_stats conversion.
		aidl_stats->iface.beaconRx = legacy_stats.iface.beacon_rx;
		aidl_stats->iface.avgRssiMgmt = legacy_stats.iface.rssi_mgmt;
		aidl_stats->iface.wmeBePktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].rx_mpdu;
		aidl_stats->iface.wmeBePktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].tx_mpdu;
		aidl_stats->iface.wmeBePktStats.lostMpdu =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].mpdu_lost;
		aidl_stats->iface.wmeBePktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].retries;
		aidl_stats->iface.wmeBeContentionTimeStats.contentionTimeMinInUsec =
		linkStats.linkId = 0;
		linkStats.beaconRx = legacy_stats.iface.beacon_rx;
		linkStats.avgRssiMgmt = legacy_stats.iface.rssi_mgmt;
		linkStats.wmeBePktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].rx_mpdu;
		linkStats.wmeBePktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].tx_mpdu;
		linkStats.wmeBePktStats.lostMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].mpdu_lost;
		linkStats.wmeBePktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].retries;
		linkStats.wmeBeContentionTimeStats.contentionTimeMinInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].contention_time_min;
		aidl_stats->iface.wmeBeContentionTimeStats.contentionTimeMaxInUsec =
		linkStats.wmeBeContentionTimeStats.contentionTimeMaxInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].contention_time_max;
		aidl_stats->iface.wmeBeContentionTimeStats.contentionTimeAvgInUsec =
		linkStats.wmeBeContentionTimeStats.contentionTimeAvgInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].contention_time_avg;
		aidl_stats->iface.wmeBeContentionTimeStats.contentionNumSamples =
		linkStats.wmeBeContentionTimeStats.contentionNumSamples =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BE].contention_num_samples;
		aidl_stats->iface.wmeBkPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].rx_mpdu;
		aidl_stats->iface.wmeBkPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].tx_mpdu;
		aidl_stats->iface.wmeBkPktStats.lostMpdu =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].mpdu_lost;
		aidl_stats->iface.wmeBkPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].retries;
		aidl_stats->iface.wmeBkContentionTimeStats.contentionTimeMinInUsec =
		linkStats.wmeBkPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].rx_mpdu;
		linkStats.wmeBkPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].tx_mpdu;
		linkStats.wmeBkPktStats.lostMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].mpdu_lost;
		linkStats.wmeBkPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].retries;
		linkStats.wmeBkContentionTimeStats.contentionTimeMinInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].contention_time_min;
		aidl_stats->iface.wmeBkContentionTimeStats.contentionTimeMaxInUsec =
		linkStats.wmeBkContentionTimeStats.contentionTimeMaxInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].contention_time_max;
		aidl_stats->iface.wmeBkContentionTimeStats.contentionTimeAvgInUsec =
		linkStats.wmeBkContentionTimeStats.contentionTimeAvgInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].contention_time_avg;
		aidl_stats->iface.wmeBkContentionTimeStats.contentionNumSamples =
		linkStats.wmeBkContentionTimeStats.contentionNumSamples =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_BK].contention_num_samples;
		aidl_stats->iface.wmeViPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].rx_mpdu;
		aidl_stats->iface.wmeViPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].tx_mpdu;
		aidl_stats->iface.wmeViPktStats.lostMpdu =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].mpdu_lost;
		aidl_stats->iface.wmeViPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].retries;
		aidl_stats->iface.wmeViContentionTimeStats.contentionTimeMinInUsec =
		linkStats.wmeViPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].rx_mpdu;
		linkStats.wmeViPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].tx_mpdu;
		linkStats.wmeViPktStats.lostMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].mpdu_lost;
		linkStats.wmeViPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].retries;
		linkStats.wmeViContentionTimeStats.contentionTimeMinInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].contention_time_min;
		aidl_stats->iface.wmeViContentionTimeStats.contentionTimeMaxInUsec =
		linkStats.wmeViContentionTimeStats.contentionTimeMaxInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].contention_time_max;
		aidl_stats->iface.wmeViContentionTimeStats.contentionTimeAvgInUsec =
		linkStats.wmeViContentionTimeStats.contentionTimeAvgInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].contention_time_avg;
		aidl_stats->iface.wmeViContentionTimeStats.contentionNumSamples =
		linkStats.wmeViContentionTimeStats.contentionNumSamples =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VI].contention_num_samples;
		aidl_stats->iface.wmeVoPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].rx_mpdu;
		aidl_stats->iface.wmeVoPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].tx_mpdu;
		aidl_stats->iface.wmeVoPktStats.lostMpdu =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].mpdu_lost;
		aidl_stats->iface.wmeVoPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].retries;
		aidl_stats->iface.wmeVoContentionTimeStats.contentionTimeMinInUsec =
		linkStats.wmeVoPktStats.rxMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].rx_mpdu;
		linkStats.wmeVoPktStats.txMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].tx_mpdu;
		linkStats.wmeVoPktStats.lostMpdu = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].mpdu_lost;
		linkStats.wmeVoPktStats.retries = legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].retries;
		linkStats.wmeVoContentionTimeStats.contentionTimeMinInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].contention_time_min;
		aidl_stats->iface.wmeVoContentionTimeStats.contentionTimeMaxInUsec =
		linkStats.wmeVoContentionTimeStats.contentionTimeMaxInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].contention_time_max;
		aidl_stats->iface.wmeVoContentionTimeStats.contentionTimeAvgInUsec =
		linkStats.wmeVoContentionTimeStats.contentionTimeAvgInUsec =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].contention_time_avg;
		aidl_stats->iface.wmeVoContentionTimeStats.contentionNumSamples =
		linkStats.wmeVoContentionTimeStats.contentionNumSamples =
		legacy_stats.iface.ac[legacy_hal::WIFI_AC_VO].contention_num_samples;
		aidl_stats->iface.timeSliceDutyCycleInPercent =
		legacy_stats.iface.info.time_slicing_duty_cycle_percent;
		linkStats.timeSliceDutyCycleInPercent = legacy_stats.iface.info.time_slicing_duty_cycle_percent;
		// peer info legacy_stats conversion.
		std::vector<StaPeerInfo> aidl_peers_info_stats;
		for (const auto& legacy_peer_info_stats : legacy_stats.peers) {
		@@ -1012,7 +1101,9 @@ bool convertLegacyLinkLayerStatsToAidl(const legacy_hal::LinkLayerStats& legacy_
		}
		aidl_peers_info_stats.push_back(aidl_peer_info_stats);
		}
		aidl_stats->iface.peers = aidl_peers_info_stats;
		linkStats.peers = aidl_peers_info_stats;
		links.push_back(linkStats);
		aidl_stats->iface.links = links;
		// radio legacy_stats conversion.
		std::vector<StaLinkLayerRadioStats> aidl_radios_stats;
		for (const auto& legacy_radio_stats : legacy_stats.radios) {