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

Commit 4d28265c authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "wifi: fix a use of an uninitialized value" into sc-dev am: 48bc8ffb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13416685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ff89b1fe1764e0f7d3ec787bdfacbc9bc736a6d
parents 6ba7b608 48bc8ffb

wifi/1.5/default/wifi_chip.cpp

+4 −5
Original line number Diff line number Diff line
@@ -1036,7 +1036,6 @@ WifiStatus WifiChip::removeApIfaceInternal(const std::string& ifname) { 


WifiStatus WifiChip::removeIfaceInstanceFromBridgedApIfaceInternal(

    const std::string& ifname, const std::string& ifInstanceName) {

    legacy_hal::wifi_error legacy_status;

    const auto iface = findUsingName(ap_ifaces_, ifname);

    if (!iface.get() || ifInstanceName.empty()) {

        return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
@@ -1048,13 +1047,13 @@ WifiStatus WifiChip::removeIfaceInstanceFromBridgedApIfaceInternal( 
                if (iface == ifInstanceName) {

                    if (!iface_util_.lock()->removeIfaceFromBridge(it.first,

                                                                   iface)) {

                        LOG(ERROR) << "Failed to remove interface: " << iface

                                   << " from " << ifname << ", error: "

                                   << legacyErrorToString(legacy_status);

                        LOG(ERROR)

                            << "Failed to remove interface: " << ifInstanceName

                            << " from " << ifname;

                        return createWifiStatus(

                            WifiStatusCode::ERROR_NOT_AVAILABLE);

                    }

                    legacy_status =

                    legacy_hal::wifi_error legacy_status =

                        legacy_hal_.lock()->deleteVirtualInterface(iface);

                    if (legacy_status != legacy_hal::WIFI_SUCCESS) {

                        LOG(ERROR) << "Failed to del interface: " << iface