diff options
| author | Roshan Pius <rpius@google.com> | 2020-04-17 06:12:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-17 06:12:32 +0000 |
| commit | d234d8b1d6e444eb93ee32fe10e134a32f5a1178 (patch) | |
| tree | 9e8c0ec77b2b0fd6b1049108319b3575fcfc6979 /wifi/1.4 | |
| parent | ef826c728c6e8aebc5396d4746c82dc75ce054f2 (diff) | |
| parent | 322677a17218bf7be7e92e76679879509504db35 (diff) | |
| download | platform_hardware_interfaces-d234d8b1d6e444eb93ee32fe10e134a32f5a1178.tar.gz platform_hardware_interfaces-d234d8b1d6e444eb93ee32fe10e134a32f5a1178.tar.bz2 platform_hardware_interfaces-d234d8b1d6e444eb93ee32fe10e134a32f5a1178.zip | |
Merge "wifi_sta_iface: Deprecate setScanningMacOui" into rvc-dev
Diffstat (limited to 'wifi/1.4')
| -rw-r--r-- | wifi/1.4/default/wifi_legacy_hal.cpp | 7 | ||||
| -rw-r--r-- | wifi/1.4/default/wifi_legacy_hal.h | 2 | ||||
| -rw-r--r-- | wifi/1.4/default/wifi_sta_iface.cpp | 7 |
3 files changed, 3 insertions, 13 deletions
diff --git a/wifi/1.4/default/wifi_legacy_hal.cpp b/wifi/1.4/default/wifi_legacy_hal.cpp index f5961954df..29123bfe47 100644 --- a/wifi/1.4/default/wifi_legacy_hal.cpp +++ b/wifi/1.4/default/wifi_legacy_hal.cpp @@ -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( diff --git a/wifi/1.4/default/wifi_legacy_hal.h b/wifi/1.4/default/wifi_legacy_hal.h index c697ff9682..99644604cc 100644 --- a/wifi/1.4/default/wifi_legacy_hal.h +++ b/wifi/1.4/default/wifi_legacy_hal.h @@ -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); diff --git a/wifi/1.4/default/wifi_sta_iface.cpp b/wifi/1.4/default/wifi_sta_iface.cpp index e2ea6e464e..49f383ae2f 100644 --- a/wifi/1.4/default/wifi_sta_iface.cpp +++ b/wifi/1.4/default/wifi_sta_iface.cpp @@ -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() { |