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

Commit 341b5a39 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Automerger Merge Worker
Browse files

Merge "Wifi: Optionally avoid interface down/up when doing setMacAddress" into... 

Merge "Wifi: Optionally avoid interface down/up when doing setMacAddress" into rvc-dev am: c4c9da2f

Change-Id: I3c356eb449fd8e2949b368a27760abe686aa4af3
parents 535997b9 c4c9da2f

wifi/1.4/default/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ endif 
ifdef WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION

endif

ifdef WIFI_AVOID_IFACE_RESET_MAC_CHANGE

LOCAL_CPPFLAGS += -DWIFI_AVOID_IFACE_RESET_MAC_CHANGE

endif

# Allow implicit fallthroughs in wifi_legacy_hal.cpp until they are fixed.

LOCAL_CFLAGS += -Wno-error=implicit-fallthrough

LOCAL_SRC_FILES := \

wifi/1.4/default/wifi_iface_util.cpp

+4 −0
Original line number Diff line number Diff line
@@ -52,18 +52,22 @@ std::array<uint8_t, 6> WifiIfaceUtil::getFactoryMacAddress( 


bool WifiIfaceUtil::setMacAddress(const std::string& iface_name,

                                  const std::array<uint8_t, 6>& mac) {

#ifndef WIFI_AVOID_IFACE_RESET_MAC_CHANGE

    if (!iface_tool_.lock()->SetUpState(iface_name.c_str(), false)) {

        LOG(ERROR) << "SetUpState(false) failed.";

        return false;

    }

#endif

    if (!iface_tool_.lock()->SetMacAddress(iface_name.c_str(), mac)) {

        LOG(ERROR) << "SetMacAddress failed.";

        return false;

    }

#ifndef WIFI_AVOID_IFACE_RESET_MAC_CHANGE

    if (!iface_tool_.lock()->SetUpState(iface_name.c_str(), true)) {

        LOG(ERROR) << "SetUpState(true) failed.";

        return false;

    }

#endif

    IfaceEventHandlers event_handlers = {};

    const auto it = event_handlers_map_.find(iface_name);

    if (it != event_handlers_map_.end()) {