Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d158ed14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "wifi(implementation): Fix unit test failures"

parents f6f522c5 1cd82a8c

wifi/1.3/default/tests/mock_wifi_legacy_hal.h

+4 −0
Original line number Diff line number Diff line
@@ -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,

wifi/1.3/default/wifi_legacy_hal.h

+2 −2
Original line number Diff line number Diff line
@@ -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);