From d3536bf9ed8814626fa8e13b8b8eed5b8c8c923b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 20 Apr 2018 15:43:37 -0700 Subject: [PATCH] wifi(implementation): Use stub for |read_packet_filter| Use the stub to take care of vendors who don't implement the new HAL functionality. Note: This is just an internal cleanup to be consistent with other functions. Bug: 73804303 Test: Compiles Change-Id: I393194772f35a3620c5acd4d5c3b5a6d072cd507 --- wifi/1.2/default/wifi_legacy_hal.cpp | 4 ---- wifi/1.2/default/wifi_legacy_hal_stubs.cpp | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/wifi/1.2/default/wifi_legacy_hal.cpp b/wifi/1.2/default/wifi_legacy_hal.cpp index c314e6451a..375204c70d 100644 --- a/wifi/1.2/default/wifi_legacy_hal.cpp +++ b/wifi/1.2/default/wifi_legacy_hal.cpp @@ -494,10 +494,6 @@ wifi_error WifiLegacyHal::setPacketFilter(const std::string& iface_name, std::pair> WifiLegacyHal::readApfPacketFilterData(const std::string& iface_name) { - if (global_func_table_.wifi_read_packet_filter == nullptr) { - return {WIFI_ERROR_NOT_SUPPORTED, {}}; - } - PacketFilterCapabilities caps; wifi_error status = global_func_table_.wifi_get_packet_filter_capabilities( getIfaceHandle(iface_name), &caps.version, &caps.max_len); diff --git a/wifi/1.2/default/wifi_legacy_hal_stubs.cpp b/wifi/1.2/default/wifi_legacy_hal_stubs.cpp index 24aaf154f8..fc28bb55e8 100644 --- a/wifi/1.2/default/wifi_legacy_hal_stubs.cpp +++ b/wifi/1.2/default/wifi_legacy_hal_stubs.cpp @@ -130,6 +130,7 @@ bool initHalFuncTableWithStubs(wifi_hal_fn* hal_fn) { populateStubFor(&hal_fn->wifi_nan_data_end); populateStubFor(&hal_fn->wifi_get_packet_filter_capabilities); populateStubFor(&hal_fn->wifi_set_packet_filter); + populateStubFor(&hal_fn->wifi_read_packet_filter); populateStubFor(&hal_fn->wifi_get_roaming_capabilities); populateStubFor(&hal_fn->wifi_enable_firmware_roaming); populateStubFor(&hal_fn->wifi_configure_roaming);