Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused DEBUG_PACKET_FATE capability

Browse Source 
from StaIfaceCapabilityMask.

Bug: 266521428
Test: atest VtsHalWifiStaIfaceTargetTest
Change-Id: If20728567cb8877ae54488480e13fd8541640b92
This commit is contained in:
Gabriel Biren
2023-02-15 23:50:07 +00:00
parent 7c27e36771
commit dd47e716a0
6 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl
View File

@@ -78,6 +78,5 @@ interface IWifiStaIface {
TDLS_OFFCHANNEL = (1 << 11) /* 2048 */,
ND_OFFLOAD = (1 << 12) /* 4096 */,
KEEP_ALIVE = (1 << 13) /* 8192 */,
DEBUG_PACKET_FATE = (1 << 14) /* 16384 */,
}
}

4
wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl
View File

@@ -99,10 +99,6 @@ interface IWifiStaIface {
* Support for keep alive packet offload.
*/
KEEP_ALIVE = 1 << 13,
/**
* Support for tracking connection packets' fate.
*/
DEBUG_PACKET_FATE = 1 << 14,
}
/**

20
wifi/aidl/default/aidl_struct_util.cpp
View File

@@ -41,16 +41,6 @@ inline std::vector<int32_t> uintToIntVec(const std::vector<uint32_t>& in) {
return std::vector<int32_t>(in.begin(), in.end());
}
IWifiStaIface::StaIfaceCapabilityMask convertLegacyLoggerFeatureToAidlStaIfaceCapability(
uint32_t feature) {
switch (feature) {
case legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED:
return IWifiStaIface::StaIfaceCapabilityMask::DEBUG_PACKET_FATE;
};
CHECK(false) << "Unknown legacy feature: " << feature;
return {};
}
IWifiChip::ChipCapabilityMask convertLegacyFeatureToAidlChipCapability(uint64_t feature) {
switch (feature) {
case WIFI_FEATURE_SET_TX_POWER_LIMIT:
@@ -459,19 +449,11 @@ bool convertLegacyWifiMacInfosToAidl(
return true;
}
bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set,
uint32_t legacy_logger_feature_set,
uint32_t* aidl_caps) {
bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps) {
if (!aidl_caps) {
return false;
}
*aidl_caps = {};
for (const auto feature : {legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED}) {
if (feature & legacy_logger_feature_set) {
*aidl_caps |= static_cast<uint32_t>(
convertLegacyLoggerFeatureToAidlStaIfaceCapability(feature));
}
}
for (const auto feature :
{WIFI_FEATURE_GSCAN, WIFI_FEATURE_LINK_LAYER_STATS, WIFI_FEATURE_RSSI_MONITOR,
WIFI_FEATURE_CONTROL_ROAMING, WIFI_FEATURE_IE_WHITELIST, WIFI_FEATURE_SCAN_RAND,

4
wifi/aidl/default/aidl_struct_util.h
View File

@@ -69,9 +69,7 @@ WifiBand convertLegacyMacBandToAidlWifiBand(uint32_t band);
WifiAntennaMode convertLegacyAntennaConfigurationToAidl(uint32_t antenna_cfg);
// STA iface conversion methods.
bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set,
uint32_t legacy_logger_feature_set,
uint32_t* aidl_caps);
bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps);
bool convertLegacyApfCapabilitiesToAidl(const legacy_hal::PacketFilterCapabilities& legacy_caps,
StaApfPacketFilterCapabilities* aidl_caps);
bool convertLegacyGscanCapabilitiesToAidl(const legacy_hal::wifi_gscan_capabilities& legacy_caps,

11
wifi/aidl/default/wifi_sta_iface.cpp
View File

@@ -249,16 +249,9 @@ WifiStaIface::getCapabilitiesInternal() {
return {IWifiStaIface::StaIfaceCapabilityMask{},
createWifiStatusFromLegacyError(legacy_status)};
}
uint32_t legacy_logger_feature_set;
std::tie(legacy_status, legacy_logger_feature_set) =
legacy_hal_.lock()->getLoggerSupportedFeatureSet(ifname_);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
// some devices don't support querying logger feature set
legacy_logger_feature_set = 0;
}
uint32_t aidl_caps;
if (!aidl_struct_util::convertLegacyFeaturesToAidlStaCapabilities(
legacy_feature_set, legacy_logger_feature_set, &aidl_caps)) {
if (!aidl_struct_util::convertLegacyFeaturesToAidlStaCapabilities(legacy_feature_set,
&aidl_caps)) {
return {IWifiStaIface::StaIfaceCapabilityMask{},
createWifiStatus(WifiStatusCode::ERROR_UNKNOWN)};
}

17
wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
View File

@@ -255,18 +255,17 @@ TEST_P(WifiStaIfaceAidlTest, EnableNDOffload) {
* PacketFateMonitoring
*/
TEST_P(WifiStaIfaceAidlTest, PacketFateMonitoring) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::DEBUG_PACKET_FATE)) {
GTEST_SKIP() << "Packet fate monitoring is not supported.";
}
// Start packet fate monitoring.
EXPECT_TRUE(wifi_sta_iface_->startDebugPacketFateMonitoring().isOk());
auto status = wifi_sta_iface_->startDebugPacketFateMonitoring();
EXPECT_TRUE(status.isOk() || checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));
// Retrieve packets.
std::vector<WifiDebugRxPacketFateReport> rx_reports;
std::vector<WifiDebugTxPacketFateReport> tx_reports;
EXPECT_TRUE(wifi_sta_iface_->getDebugRxPacketFates(&rx_reports).isOk());
EXPECT_TRUE(wifi_sta_iface_->getDebugTxPacketFates(&tx_reports).isOk());
if (status.isOk()) {
std::vector<WifiDebugRxPacketFateReport> rx_reports;
std::vector<WifiDebugTxPacketFateReport> tx_reports;
EXPECT_TRUE(wifi_sta_iface_->getDebugRxPacketFates(&rx_reports).isOk());
EXPECT_TRUE(wifi_sta_iface_->getDebugTxPacketFates(&tx_reports).isOk());
}
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WifiStaIfaceAidlTest);