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

Commit b0a9ef07 authored by Colin Cross's avatar Colin Cross
Browse files

resolve merge conflicts of 9e1ee9bb to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Iad05fce7dfa8832ed7c62326a908ab52b05268e0
parents 7fa2e6b0 9e1ee9bb

wifi/1.5/default/wifi_sta_iface.cpp

+4 −0
Original line number Diff line number Diff line
@@ -648,6 +648,10 @@ std::pair<WifiStatus, std::array<uint8_t, 6>> 
WifiStaIface::getFactoryMacAddressInternal() {

    std::array<uint8_t, 6> mac =

        iface_util_.lock()->getFactoryMacAddress(ifname_);

    if (mac[0] == 0 && mac[1] == 0 && mac[2] == 0 && mac[3] == 0 &&

        mac[4] == 0 && mac[5] == 0) {

        return {createWifiStatus(WifiStatusCode::ERROR_UNKNOWN), mac};

    }

    return {createWifiStatus(WifiStatusCode::SUCCESS), mac};

}