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

Merge "wifi: fix NULL pointer in unit tests" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-19 02:07:53 +00:00
committed by Android (Google) Code Review
parent f268ae2cef 1cfe081491
commit ac5dc18df1
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/1.6/default/tests/mock_wifi_legacy_hal.h
View File

@@ -56,6 +56,10 @@ class MockWifiLegacyHal : public WifiLegacyHal {
wifi_error(const std::string& ifname, wifi_interface_type iftype));
MOCK_METHOD1(deleteVirtualInterface, wifi_error(const std::string& ifname));
MOCK_METHOD0(waitForDriverReady, wifi_error());
MOCK_METHOD2(getSupportedIfaceName, wifi_error(uint32_t, std::string&));
MOCK_METHOD1(registerSubsystemRestartCallbackHandler,
wifi_error(const on_subsystem_restart_callback&));
MOCK_METHOD1(getSupportedFeatureSet, std::pair<wifi_error, uint64_t>(const std::string&));
};
} // namespace legacy_hal
} // namespace implementation

3
wifi/1.6/default/tests/wifi_chip_unit_tests.cpp
View File

@@ -278,6 +278,9 @@ class WifiChipTest : public Test {
.WillRepeatedly(testing::Return(true));
EXPECT_CALL(*legacy_hal_, start())
.WillRepeatedly(testing::Return(legacy_hal::WIFI_SUCCESS));
// Vendor HAL does not override the name by default.
EXPECT_CALL(*legacy_hal_, getSupportedIfaceName(testing::_, testing::_))
.WillRepeatedly(testing::Return(legacy_hal::WIFI_ERROR_UNKNOWN));
}
void TearDown() override {

6
wifi/1.6/default/wifi_legacy_hal.h
View File

@@ -496,7 +496,7 @@ class WifiLegacyHal {
const std::string& iface_name);
std::pair<wifi_error, std::vector<uint8_t>> requestFirmwareMemoryDump(
const std::string& iface_name);
std::pair<wifi_error, uint64_t> getSupportedFeatureSet(const std::string& iface_name);
virtual std::pair<wifi_error, uint64_t> getSupportedFeatureSet(const std::string& iface_name);
// APF functions.
std::pair<wifi_error, PacketFilterCapabilities> getPacketFilterCapabilities(
const std::string& iface_name);
@@ -564,7 +564,7 @@ class WifiLegacyHal {
wifi_error registerRingBufferCallbackHandler(
const std::string& iface_name, const on_ring_buffer_data_callback& on_data_callback);
wifi_error deregisterRingBufferCallbackHandler(const std::string& iface_name);
wifi_error registerSubsystemRestartCallbackHandler(
virtual wifi_error registerSubsystemRestartCallbackHandler(
const on_subsystem_restart_callback& on_restart_callback);
std::pair<wifi_error, std::vector<wifi_ring_buffer_status>> getRingBuffersStatus(
const std::string& iface_name);
@@ -637,7 +637,7 @@ class WifiLegacyHal {
virtual wifi_error createVirtualInterface(const std::string& ifname,
wifi_interface_type iftype);
virtual wifi_error deleteVirtualInterface(const std::string& ifname);
wifi_error getSupportedIfaceName(uint32_t iface_type, std::string& ifname);
virtual wifi_error getSupportedIfaceName(uint32_t iface_type, std::string& ifname);
// STA + STA functions
virtual wifi_error multiStaSetPrimaryConnection(const std::string& ifname);