diff options
| author | Roshan Pius <rpius@google.com> | 2019-03-25 13:51:28 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-03-25 13:51:28 -0700 |
| commit | 1cd82a8cf28a5c0c8e9e0fcd2769e91fb50274b3 (patch) | |
| tree | 335acdabac5e7e23fb3ff7836eb23c1f6759c000 /wifi | |
| parent | 7b277acbd06ca225c509eb0b564fc941ea909cdd (diff) | |
| download | android_hardware_interfaces-1cd82a8cf28a5c0c8e9e0fcd2769e91fb50274b3.tar.gz android_hardware_interfaces-1cd82a8cf28a5c0c8e9e0fcd2769e91fb50274b3.tar.bz2 android_hardware_interfaces-1cd82a8cf28a5c0c8e9e0fcd2769e91fb50274b3.zip | |
wifi(implementation): Fix unit test failures
ag/6722341 caused some unit test failures. Fixing them.
Bug: 127715974
Test: ./data/android.hardware.wifi@1.0-service-tests
Change-Id: Ib504cf55b9990dba081eb1b07bc32508e09ad0a6
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/1.3/default/tests/mock_wifi_legacy_hal.h | 4 | ||||
| -rw-r--r-- | wifi/1.3/default/wifi_legacy_hal.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/wifi/1.3/default/tests/mock_wifi_legacy_hal.h b/wifi/1.3/default/tests/mock_wifi_legacy_hal.h index deb3a5ae4..65fd11578 100644 --- a/wifi/1.3/default/tests/mock_wifi_legacy_hal.h +++ b/wifi/1.3/default/tests/mock_wifi_legacy_hal.h @@ -39,6 +39,10 @@ class MockWifiLegacyHal : public WifiLegacyHal { MOCK_METHOD2(registerRadioModeChangeCallbackHandler, wifi_error(const std::string&, const on_radio_mode_change_callback&)); + MOCK_METHOD1(getFirmwareVersion, std::pair<wifi_error, std::string>( + const std::string& iface_name)); + MOCK_METHOD1(getDriverVersion, std::pair<wifi_error, std::string>( + const std::string& iface_name)); MOCK_METHOD2(nanRegisterCallbackHandlers, wifi_error(const std::string&, const NanCallbackHandlers&)); MOCK_METHOD2(nanDisableRequest, diff --git a/wifi/1.3/default/wifi_legacy_hal.h b/wifi/1.3/default/wifi_legacy_hal.h index 70a919f8c..4d6beb3da 100644 --- a/wifi/1.3/default/wifi_legacy_hal.h +++ b/wifi/1.3/default/wifi_legacy_hal.h @@ -184,9 +184,9 @@ class WifiLegacyHal { // Checks if legacy HAL has successfully started bool isStarted(); // Wrappers for all the functions in the legacy HAL function table. - std::pair<wifi_error, std::string> getDriverVersion( + virtual std::pair<wifi_error, std::string> getDriverVersion( const std::string& iface_name); - std::pair<wifi_error, std::string> getFirmwareVersion( + virtual std::pair<wifi_error, std::string> getFirmwareVersion( const std::string& iface_name); std::pair<wifi_error, std::vector<uint8_t>> requestDriverMemoryDump( const std::string& iface_name); |