tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename getCapabilities to getFeatureSet

Browse source 
in IWifiChip and IWifiStaIface.

Main purpose is to distinguish between
the 2 capability methods in IWifiChip:
 - getCapabilities (renamed here)
 - getWifiChipCapabilities

Bug: 267819850
Test: atest VtsHalWifiChipTargetTest \
            VtsHalWifiStaIfaceTargetTest
Change-Id: I03c15d652d02aef99b219c2d630b69acb4d9e43c
This commit is contained in:
Gabriel Biren 2023-03-09 19:07:53 +00:00
parent 0040f27177
commit 2a391a09df
8 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl
View file

@ -47,7 +47,7 @@ interface IWifiChip {
@PropagateAllowBlocking android.hardware.wifi.IWifiApIface getApIface(in String ifname); @PropagateAllowBlocking android.hardware.wifi.IWifiApIface getApIface(in String ifname);
String[] getApIfaceNames(); String[] getApIfaceNames();
android.hardware.wifi.IWifiChip.ChipMode[] getAvailableModes(); android.hardware.wifi.IWifiChip.ChipMode[] getAvailableModes();
int getCapabilities(); int getFeatureSet();
android.hardware.wifi.WifiDebugHostWakeReasonStats getDebugHostWakeReasonStats(); android.hardware.wifi.WifiDebugHostWakeReasonStats getDebugHostWakeReasonStats();
android.hardware.wifi.WifiDebugRingBufferStatus[] getDebugRingBuffersStatus(); android.hardware.wifi.WifiDebugRingBufferStatus[] getDebugRingBuffersStatus();
int getId(); int getId();
@ -85,7 +85,7 @@ interface IWifiChip {
void setMloMode(in android.hardware.wifi.IWifiChip.ChipMloMode mode); void setMloMode(in android.hardware.wifi.IWifiChip.ChipMloMode mode);
const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF; const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum ChipCapabilityMask { enum FeatureSetMask {
SET_TX_POWER_LIMIT = (1 << 0) /* 1 */, SET_TX_POWER_LIMIT = (1 << 0) /* 1 */,
D2D_RTT = (1 << 1) /* 2 */, D2D_RTT = (1 << 1) /* 2 */,
D2AP_RTT = (1 << 2) /* 4 */, D2AP_RTT = (1 << 2) /* 4 */,

4
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl
View file

@ -41,7 +41,7 @@ interface IWifiStaIface {
void enableNdOffload(in boolean enable); void enableNdOffload(in boolean enable);
android.hardware.wifi.StaApfPacketFilterCapabilities getApfPacketFilterCapabilities(); android.hardware.wifi.StaApfPacketFilterCapabilities getApfPacketFilterCapabilities();
android.hardware.wifi.StaBackgroundScanCapabilities getBackgroundScanCapabilities(); android.hardware.wifi.StaBackgroundScanCapabilities getBackgroundScanCapabilities();
int getCapabilities(); int getFeatureSet();
android.hardware.wifi.WifiDebugRxPacketFateReport[] getDebugRxPacketFates(); android.hardware.wifi.WifiDebugRxPacketFateReport[] getDebugRxPacketFates();
android.hardware.wifi.WifiDebugTxPacketFateReport[] getDebugTxPacketFates(); android.hardware.wifi.WifiDebugTxPacketFateReport[] getDebugTxPacketFates();
byte[6] getFactoryMacAddress(); byte[6] getFactoryMacAddress();
@ -63,7 +63,7 @@ interface IWifiStaIface {
void stopSendingKeepAlivePackets(in int cmdId); void stopSendingKeepAlivePackets(in int cmdId);
void setDtimMultiplier(in int multiplier); void setDtimMultiplier(in int multiplier);
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum StaIfaceCapabilityMask { enum FeatureSetMask {
APF = (1 << 0) /* 1 */, APF = (1 << 0) /* 1 */,
BACKGROUND_SCAN = (1 << 1) /* 2 */, BACKGROUND_SCAN = (1 << 1) /* 2 */,
LINK_LAYER_STATS = (1 << 2) /* 4 */, LINK_LAYER_STATS = (1 << 2) /* 4 */,

8
wifi/aidl/android/hardware/wifi/IWifiChip.aidl
View file

@ -44,7 +44,7 @@ interface IWifiChip {
*/ */
@VintfStability @VintfStability
@Backing(type="int") @Backing(type="int")
enum ChipCapabilityMask { enum FeatureSetMask {
/** /**
* Set/Reset Tx Power limits. * Set/Reset Tx Power limits.
*/ */
@ -582,15 +582,15 @@ interface IWifiChip {
ChipMode[] getAvailableModes(); ChipMode[] getAvailableModes();
/** /**
* Get the capabilities supported by this chip. * Get the features supported by this chip.
* *
* @return Bitset of |ChipCapabilityMask| values. * @return Bitset of |FeatureSetMask| values.
* @throws ServiceSpecificException with one of the following values: * @throws ServiceSpecificException with one of the following values:
* |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|, * |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|, * |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN| * |WifiStatusCode.ERROR_UNKNOWN|
*/ */
int getCapabilities(); int getFeatureSet();
/** /**
* API to retrieve the wifi wake up reason stats for debugging. * API to retrieve the wifi wake up reason stats for debugging.

8
wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl
View file

@ -38,7 +38,7 @@ interface IWifiStaIface {
*/ */
@VintfStability @VintfStability
@Backing(type="int") @Backing(type="int")
enum StaIfaceCapabilityMask { enum FeatureSetMask {
/** /**
* Support for APF APIs. APF (Android Packet Filter) is a * Support for APF APIs. APF (Android Packet Filter) is a
* BPF-like packet filtering bytecode executed by the firmware. * BPF-like packet filtering bytecode executed by the firmware.
@ -190,15 +190,15 @@ interface IWifiStaIface {
StaBackgroundScanCapabilities getBackgroundScanCapabilities(); StaBackgroundScanCapabilities getBackgroundScanCapabilities();
/** /**
* Get the capabilities supported by this STA iface. * Get the features supported by this STA iface.
* *
* @return Bitset of |StaIfaceCapabilityMask| values. * @return Bitset of |FeatureSetMask| values.
* @throws ServiceSpecificException with one of the following values: * @throws ServiceSpecificException with one of the following values:
* |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|, * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|, * |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN| * |WifiStatusCode.ERROR_UNKNOWN|
*/ */
int getCapabilities(); int getFeatureSet();
/** /**
* API to retrieve the fates of inbound packets. * API to retrieve the fates of inbound packets.

8
wifi/aidl/vts/functional/wifi_aidl_test_utils.cpp
View file

@ -207,10 +207,10 @@ void stopWifiService(const char* instance_name) {
} }
} }
int32_t getChipCapabilities(const std::shared_ptr<IWifiChip>& wifi_chip) { int32_t getChipFeatureSet(const std::shared_ptr<IWifiChip>& wifi_chip) {
int32_t caps = 0; int32_t features = 0;
if (wifi_chip->getCapabilities(&caps).isOk()) { if (wifi_chip->getFeatureSet(&features).isOk()) {
return caps; return features;
} }
return 0; return 0;
} }

2
wifi/aidl/vts/functional/wifi_aidl_test_utils.h
View file

@ -44,6 +44,6 @@ bool configureChipToSupportConcurrencyType(const std::shared_ptr<IWifiChip>& wif
IfaceConcurrencyType type, int* configured_mode_id); IfaceConcurrencyType type, int* configured_mode_id);
// Used to trigger IWifi.stop() at the end of every test. // Used to trigger IWifi.stop() at the end of every test.
void stopWifiService(const char* instance_name); void stopWifiService(const char* instance_name);
int32_t getChipCapabilities(const std::shared_ptr<IWifiChip>& wifi_chip); int32_t getChipFeatureSet(const std::shared_ptr<IWifiChip>& wifi_chip);
bool checkStatusCode(ndk::ScopedAStatus* status, WifiStatusCode expected_code); bool checkStatusCode(ndk::ScopedAStatus* status, WifiStatusCode expected_code);
bool isAidlServiceAvailable(const char* instance_name); bool isAidlServiceAvailable(const char* instance_name);

34
wifi/aidl/vts/functional/wifi_chip_aidl_test.cpp
View file

@ -185,12 +185,12 @@ TEST_P(WifiChipAidlTest, RegisterEventCallback) {
} }
/* /*
* GetCapabilities * GetFeatureSet
*/ */
TEST_P(WifiChipAidlTest, GetCapabilities) { TEST_P(WifiChipAidlTest, GetFeatureSet) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
EXPECT_NE(static_cast<int32_t>(caps), 0); EXPECT_NE(features, 0);
} }
/* /*
@ -269,9 +269,9 @@ TEST_P(WifiChipAidlTest, SetCountryCode) {
*/ */
TEST_P(WifiChipAidlTest, SetLatencyMode_normal) { TEST_P(WifiChipAidlTest, SetLatencyMode_normal) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
auto status = wifi_chip_->setLatencyMode(IWifiChip::LatencyMode::NORMAL); auto status = wifi_chip_->setLatencyMode(IWifiChip::LatencyMode::NORMAL);
if (caps & static_cast<int32_t>(IWifiChip::ChipCapabilityMask::SET_LATENCY_MODE)) { if (features & static_cast<int32_t>(IWifiChip::FeatureSetMask::SET_LATENCY_MODE)) {
EXPECT_TRUE(status.isOk()); EXPECT_TRUE(status.isOk());
} else { } else {
EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED)); EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));
@ -284,9 +284,9 @@ TEST_P(WifiChipAidlTest, SetLatencyMode_normal) {
*/ */
TEST_P(WifiChipAidlTest, SetLatencyMode_low) { TEST_P(WifiChipAidlTest, SetLatencyMode_low) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
auto status = wifi_chip_->setLatencyMode(IWifiChip::LatencyMode::LOW); auto status = wifi_chip_->setLatencyMode(IWifiChip::LatencyMode::LOW);
if (caps & static_cast<int32_t>(IWifiChip::ChipCapabilityMask::SET_LATENCY_MODE)) { if (features & static_cast<int32_t>(IWifiChip::FeatureSetMask::SET_LATENCY_MODE)) {
EXPECT_TRUE(status.isOk()); EXPECT_TRUE(status.isOk());
} else { } else {
EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED)); EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));
@ -366,12 +366,12 @@ TEST_P(WifiChipAidlTest, SetCoexUnsafeChannels) {
*/ */
TEST_P(WifiChipAidlTest, SelectTxPowerScenario_body) { TEST_P(WifiChipAidlTest, SelectTxPowerScenario_body) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
int32_t expected_caps = int32_t expected_features =
static_cast<int32_t>(IWifiChip::ChipCapabilityMask::SET_TX_POWER_LIMIT) | static_cast<int32_t>(IWifiChip::FeatureSetMask::SET_TX_POWER_LIMIT) |
static_cast<int32_t>(IWifiChip::ChipCapabilityMask::USE_BODY_HEAD_SAR); static_cast<int32_t>(IWifiChip::FeatureSetMask::USE_BODY_HEAD_SAR);
auto status = wifi_chip_->selectTxPowerScenario(IWifiChip::TxPowerScenario::ON_BODY_CELL_OFF); auto status = wifi_chip_->selectTxPowerScenario(IWifiChip::TxPowerScenario::ON_BODY_CELL_OFF);
if (caps & expected_caps) { if (features & expected_features) {
EXPECT_TRUE(status.isOk()); EXPECT_TRUE(status.isOk());
} else { } else {
EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED)); EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));
@ -383,9 +383,9 @@ TEST_P(WifiChipAidlTest, SelectTxPowerScenario_body) {
*/ */
TEST_P(WifiChipAidlTest, SelectTxPowerScenario_voiceCall) { TEST_P(WifiChipAidlTest, SelectTxPowerScenario_voiceCall) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
auto status = wifi_chip_->selectTxPowerScenario(IWifiChip::TxPowerScenario::VOICE_CALL); auto status = wifi_chip_->selectTxPowerScenario(IWifiChip::TxPowerScenario::VOICE_CALL);
if (caps & static_cast<int32_t>(IWifiChip::ChipCapabilityMask::SET_TX_POWER_LIMIT)) { if (features & static_cast<int32_t>(IWifiChip::FeatureSetMask::SET_TX_POWER_LIMIT)) {
EXPECT_TRUE(status.isOk()); EXPECT_TRUE(status.isOk());
} else { } else {
EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED)); EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));
@ -397,9 +397,9 @@ TEST_P(WifiChipAidlTest, SelectTxPowerScenario_voiceCall) {
*/ */
TEST_P(WifiChipAidlTest, ResetTxPowerScenario) { TEST_P(WifiChipAidlTest, ResetTxPowerScenario) {
configureChipForConcurrencyType(IfaceConcurrencyType::STA); configureChipForConcurrencyType(IfaceConcurrencyType::STA);
int32_t caps = getChipCapabilities(wifi_chip_); int32_t features = getChipFeatureSet(wifi_chip_);
auto status = wifi_chip_->resetTxPowerScenario(); auto status = wifi_chip_->resetTxPowerScenario();
if (caps & static_cast<int32_t>(IWifiChip::ChipCapabilityMask::SET_TX_POWER_LIMIT)) { if (features & static_cast<int32_t>(IWifiChip::FeatureSetMask::SET_TX_POWER_LIMIT)) {
EXPECT_TRUE(status.isOk()); EXPECT_TRUE(status.isOk());
} else { } else {
EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED)); EXPECT_TRUE(checkStatusCode(&status, WifiStatusCode::ERROR_NOT_SUPPORTED));

32
wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
View file

@ -53,10 +53,10 @@ class WifiStaIfaceAidlTest : public testing::TestWithParam<std::string> {
void TearDown() override { stopWifiService(getInstanceName()); } void TearDown() override { stopWifiService(getInstanceName()); }
protected: protected:
bool isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask expected) { bool isFeatureSupported(IWifiStaIface::FeatureSetMask expected) {
int32_t caps = 0; int32_t features = 0;
EXPECT_TRUE(wifi_sta_iface_->getCapabilities(&caps).isOk()); EXPECT_TRUE(wifi_sta_iface_->getFeatureSet(&features).isOk());
return caps & static_cast<int32_t>(expected); return features & static_cast<int32_t>(expected);
} }
ndk::ScopedAStatus createStaIface(std::shared_ptr<IWifiStaIface>* sta_iface) { ndk::ScopedAStatus createStaIface(std::shared_ptr<IWifiStaIface>* sta_iface) {
@ -83,19 +83,19 @@ TEST_P(WifiStaIfaceAidlTest, GetFactoryMacAddress) {
} }
/* /*
* GetCapabilities * GetFeatureSet
*/ */
TEST_P(WifiStaIfaceAidlTest, GetCapabilities) { TEST_P(WifiStaIfaceAidlTest, GetFeatureSet) {
int32_t caps = 0; int32_t features = 0;
EXPECT_TRUE(wifi_sta_iface_->getCapabilities(&caps).isOk()); EXPECT_TRUE(wifi_sta_iface_->getFeatureSet(&features).isOk());
EXPECT_NE(caps, 0); EXPECT_NE(features, 0);
} }
/* /*
* GetApfPacketFilterCapabilities * GetApfPacketFilterCapabilities
*/ */
TEST_P(WifiStaIfaceAidlTest, GetApfPacketFilterCapabilities) { TEST_P(WifiStaIfaceAidlTest, GetApfPacketFilterCapabilities) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::APF)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::APF)) {
GTEST_SKIP() << "APF packet filter capabilities are not supported."; GTEST_SKIP() << "APF packet filter capabilities are not supported.";
} }
StaApfPacketFilterCapabilities apf_caps = {}; StaApfPacketFilterCapabilities apf_caps = {};
@ -106,7 +106,7 @@ TEST_P(WifiStaIfaceAidlTest, GetApfPacketFilterCapabilities) {
* GetBackgroundScanCapabilities * GetBackgroundScanCapabilities
*/ */
TEST_P(WifiStaIfaceAidlTest, GetBackgroundScanCapabilities) { TEST_P(WifiStaIfaceAidlTest, GetBackgroundScanCapabilities) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::BACKGROUND_SCAN)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::BACKGROUND_SCAN)) {
GTEST_SKIP() << "Background scan capabilities are not supported."; GTEST_SKIP() << "Background scan capabilities are not supported.";
} }
StaBackgroundScanCapabilities caps = {}; StaBackgroundScanCapabilities caps = {};
@ -129,7 +129,7 @@ TEST_P(WifiStaIfaceAidlTest, GetValidFrequenciesForBand) {
* StaLinkLayerStats after link layer stats collection is enabled. * StaLinkLayerStats after link layer stats collection is enabled.
*/ */
TEST_P(WifiStaIfaceAidlTest, GetLinkLayerStats) { TEST_P(WifiStaIfaceAidlTest, GetLinkLayerStats) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::LINK_LAYER_STATS)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::LINK_LAYER_STATS)) {
GTEST_SKIP() << "Skipping this test since link layer stats are not supported."; GTEST_SKIP() << "Skipping this test since link layer stats are not supported.";
} }
@ -176,7 +176,7 @@ TEST_P(WifiStaIfaceAidlTest, SetScanMode) {
* LinkLayerStatsCollection * LinkLayerStatsCollection
*/ */
TEST_P(WifiStaIfaceAidlTest, LinkLayerStatsCollection) { TEST_P(WifiStaIfaceAidlTest, LinkLayerStatsCollection) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::LINK_LAYER_STATS)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::LINK_LAYER_STATS)) {
GTEST_SKIP() << "Link layer stats collection is not supported."; GTEST_SKIP() << "Link layer stats collection is not supported.";
} }
@ -197,7 +197,7 @@ TEST_P(WifiStaIfaceAidlTest, LinkLayerStatsCollection) {
* if the device is not connected to an AP. * if the device is not connected to an AP.
*/ */
TEST_P(WifiStaIfaceAidlTest, RSSIMonitoring) { TEST_P(WifiStaIfaceAidlTest, RSSIMonitoring) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::RSSI_MONITOR)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::RSSI_MONITOR)) {
GTEST_SKIP() << "RSSI monitoring is not supported."; GTEST_SKIP() << "RSSI monitoring is not supported.";
} }
@ -213,7 +213,7 @@ TEST_P(WifiStaIfaceAidlTest, RSSIMonitoring) {
* RoamingControl * RoamingControl
*/ */
TEST_P(WifiStaIfaceAidlTest, RoamingControl) { TEST_P(WifiStaIfaceAidlTest, RoamingControl) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::CONTROL_ROAMING)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::CONTROL_ROAMING)) {
GTEST_SKIP() << "Roaming control is not supported."; GTEST_SKIP() << "Roaming control is not supported.";
} }
@ -245,7 +245,7 @@ TEST_P(WifiStaIfaceAidlTest, RoamingControl) {
* EnableNDOffload * EnableNDOffload
*/ */
TEST_P(WifiStaIfaceAidlTest, EnableNDOffload) { TEST_P(WifiStaIfaceAidlTest, EnableNDOffload) {
if (!isCapabilitySupported(IWifiStaIface::StaIfaceCapabilityMask::ND_OFFLOAD)) { if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::ND_OFFLOAD)) {
GTEST_SKIP() << "ND offload is not supported."; GTEST_SKIP() << "ND offload is not supported.";
} }
EXPECT_TRUE(wifi_sta_iface_->enableNdOffload(true).isOk()); EXPECT_TRUE(wifi_sta_iface_->enableNdOffload(true).isOk());