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

Commit 72a30a0f authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "wifi: Wait for driver ready and bring up the interface when setMacAddress fails" into sc-dev

parents abdf43cd 8c1a67b7

wifi/1.5/default/service.cpp

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ using android::hardware::joinRpcThreadpool; 
using android::hardware::LazyServiceRegistrar;

using android::hardware::wifi::V1_5::implementation::feature_flags::

    WifiFeatureFlags;

using android::hardware::wifi::V1_5::implementation::iface_util::WifiIfaceUtil;

using android::hardware::wifi::V1_5::implementation::legacy_hal::WifiLegacyHal;

using android::hardware::wifi::V1_5::implementation::legacy_hal::

    WifiLegacyHalFactory;
@@ -63,7 +62,6 @@ int main(int /*argc*/, char** argv) { 
        new android::hardware::wifi::V1_5::implementation::Wifi(

            iface_tool, legacy_hal_factory,

            std::make_shared<WifiModeController>(),

            std::make_shared<WifiIfaceUtil>(iface_tool),

            std::make_shared<WifiFeatureFlags>());

    if (kLazyService) {

        auto registrar = LazyServiceRegistrar::getInstance();

wifi/1.5/default/tests/mock_wifi_iface_util.cpp

+3 −2
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ namespace implementation { 
namespace iface_util {



MockWifiIfaceUtil::MockWifiIfaceUtil(

    const std::weak_ptr<wifi_system::InterfaceTool> iface_tool)

    : WifiIfaceUtil(iface_tool) {}

    const std::weak_ptr<wifi_system::InterfaceTool> iface_tool,

    const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)

    : WifiIfaceUtil(iface_tool, legacy_hal) {}

}  // namespace iface_util

}  // namespace implementation

}  // namespace V1_5

wifi/1.5/default/tests/mock_wifi_iface_util.h

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ namespace iface_util { 
class MockWifiIfaceUtil : public WifiIfaceUtil {

   public:

    MockWifiIfaceUtil(

        const std::weak_ptr<wifi_system::InterfaceTool> iface_tool);

        const std::weak_ptr<wifi_system::InterfaceTool> iface_tool,

        const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);

    MOCK_METHOD1(getFactoryMacAddress,

                 std::array<uint8_t, 6>(const std::string&));

    MOCK_METHOD2(setMacAddress,

wifi/1.5/default/tests/mock_wifi_legacy_hal.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 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());

};

}  // namespace legacy_hal

}  // namespace implementation

wifi/1.5/default/tests/wifi_chip_unit_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ class WifiChipTest : public Test { 
    std::shared_ptr<NiceMock<mode_controller::MockWifiModeController>>

        mode_controller_{new NiceMock<mode_controller::MockWifiModeController>};

    std::shared_ptr<NiceMock<iface_util::MockWifiIfaceUtil>> iface_util_{

        new NiceMock<iface_util::MockWifiIfaceUtil>(iface_tool_)};

        new NiceMock<iface_util::MockWifiIfaceUtil>(iface_tool_, legacy_hal_)};

    std::shared_ptr<NiceMock<feature_flags::MockWifiFeatureFlags>>

        feature_flags_{new NiceMock<feature_flags::MockWifiFeatureFlags>};