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

wifi_sta_iface: Deprecate setScanningMacOui

Browse Source 
Bug: 154267383
Test: Device boots up and connects to wifi networks.
Change-Id: I70206e2c25d90ebd5ac35938af9ca2ebffefa318
This commit is contained in:
Roshan Pius
2020-04-16 16:18:23 -07:00
parent cedd3f387b
commit 322677a172
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
View File

@@ -260,8 +260,8 @@ TEST_P(WifiStaIfaceHidlTest, EnableNDOffload) {
/*
* SetScanningMacOui:
* Ensures that calls to set scanning MAC OUI will return a success status
* code.
* Ensures that calls to set scanning MAC OUI will return a NOT_SUPPORTED
* code since it is now deprecated.
*/
TEST_P(WifiStaIfaceHidlTest, SetScanningMacOui) {
if (!isCapabilitySupported(
@@ -271,7 +271,7 @@ TEST_P(WifiStaIfaceHidlTest, SetScanningMacOui) {
}
const android::hardware::hidl_array<uint8_t, 3> kOui{
std::array<uint8_t, 3>{{0x10, 0x22, 0x33}}};
EXPECT_EQ(WifiStatusCode::SUCCESS,
EXPECT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
HIDL_INVOKE(wifi_sta_iface_, setScanningMacOui, kOui).code);
}

7
wifi/1.4/default/wifi_legacy_hal.cpp
View File

@@ -801,13 +801,6 @@ wifi_error WifiLegacyHal::stopSendingOffloadedPacket(
cmd_id, getIfaceHandle(iface_name));
}
wifi_error WifiLegacyHal::setScanningMacOui(const std::string& iface_name,
const std::array<uint8_t, 3>& oui) {
std::vector<uint8_t> oui_internal(oui.data(), oui.data() + oui.size());
return global_func_table_.wifi_set_scanning_mac_oui(
getIfaceHandle(iface_name), oui_internal.data());
}
wifi_error WifiLegacyHal::selectTxPowerScenario(const std::string& iface_name,
wifi_power_scenario scenario) {
return global_func_table_.wifi_select_tx_power_scenario(

2
wifi/1.4/default/wifi_legacy_hal.h
View File

@@ -252,8 +252,6 @@ class WifiLegacyHal {
const std::array<uint8_t, 6>& dst_address, uint32_t period_in_ms);
wifi_error stopSendingOffloadedPacket(const std::string& iface_name,
uint32_t cmd_id);
wifi_error setScanningMacOui(const std::string& iface_name,
const std::array<uint8_t, 3>& oui);
virtual wifi_error selectTxPowerScenario(const std::string& iface_name,
wifi_power_scenario scenario);
virtual wifi_error resetTxPowerScenario(const std::string& iface_name);

7
wifi/1.4/default/wifi_sta_iface.cpp
View File

@@ -578,10 +578,9 @@ WifiStatus WifiStaIface::stopSendingKeepAlivePacketsInternal(uint32_t cmd_id) {
}
WifiStatus WifiStaIface::setScanningMacOuiInternal(
const std::array<uint8_t, 3>& oui) {
legacy_hal::wifi_error legacy_status =
legacy_hal_.lock()->setScanningMacOui(ifname_, oui);
return createWifiStatusFromLegacyError(legacy_status);
const std::array<uint8_t, 3>& /* oui */) {
// deprecated.
return createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED);
}
WifiStatus WifiStaIface::startDebugPacketFateMonitoringInternal() {