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

Commit d9d04b4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: Fix single AP iface isn't deleted" into udc-dev am: 5d806f5a am: 780ed94a 

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



Change-Id: I12e6fa1b817c321f99653a32d4eb70911b135822
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 420879d7 780ed94a

wifi/aidl/default/wifi_chip.cpp

+19 −13
Original line number Diff line number Diff line
@@ -975,14 +975,14 @@ WifiChip::createBridgedApIfaceInternal() { 
    br_ifaces_ap_instances_[br_ifname] = ap_instances;

    if (!iface_util_->createBridge(br_ifname)) {

        LOG(ERROR) << "Failed createBridge - br_name=" << br_ifname.c_str();

        invalidateAndClearBridgedAp(br_ifname);

        deleteApIface(br_ifname);

        return {nullptr, createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE)};

    }

    for (auto const& instance : ap_instances) {

        // Bind ap instance interface to AP bridge

        if (!iface_util_->addIfaceToBridge(br_ifname, instance)) {

            LOG(ERROR) << "Failed add if to Bridge - if_name=" << instance.c_str();

            invalidateAndClearBridgedAp(br_ifname);

            deleteApIface(br_ifname);

            return {nullptr, createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE)};

        }

    }
@@ -1016,8 +1016,7 @@ ndk::ScopedAStatus WifiChip::removeApIfaceInternal(const std::string& ifname) { 
    // nan/rtt objects over AP iface. But, there is no harm to do it

    // here and not make that assumption all over the place.

    invalidateAndRemoveDependencies(ifname);

    // Clear the bridge interface and the iface instance.

    invalidateAndClearBridgedAp(ifname);

    deleteApIface(ifname);

    invalidateAndClear(ap_ifaces_, iface);

    for (const auto& callback : event_cb_handler_.getCallbacks()) {

        if (!callback->onIfaceRemoved(IfaceType::AP, ifname).isOk()) {
@@ -1960,21 +1959,28 @@ void WifiChip::invalidateAndClearBridgedApAll() { 
    br_ifaces_ap_instances_.clear();

}



void WifiChip::invalidateAndClearBridgedAp(const std::string& br_name) {

    if (br_name.empty()) return;

    // delete managed interfaces

void WifiChip::deleteApIface(const std::string& if_name) {

    if (if_name.empty()) return;

    // delete bridged interfaces if any

    for (auto const& it : br_ifaces_ap_instances_) {

        if (it.first == br_name) {

        if (it.first == if_name) {

            for (auto const& iface : it.second) {

                iface_util_->removeIfaceFromBridge(br_name, iface);

                iface_util_->removeIfaceFromBridge(if_name, iface);

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

            }

            iface_util_->deleteBridge(br_name);

            br_ifaces_ap_instances_.erase(br_name);

            break;

            iface_util_->deleteBridge(if_name);

            br_ifaces_ap_instances_.erase(if_name);

            // ifname is bridged AP, return here.

            return;

        }

    }

    return;



    // No bridged AP case, delete AP iface

    legacy_hal::wifi_error legacy_status = legacy_hal_.lock()->deleteVirtualInterface(if_name);

    if (legacy_status != legacy_hal::WIFI_SUCCESS) {

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

                   << legacyErrorToString(legacy_status);

    }

}



bool WifiChip::findUsingNameFromBridgedApInstances(const std::string& name) {

wifi/aidl/default/wifi_chip.h

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ class WifiChip : public BnWifiChip { 
    bool writeRingbufferFilesInternal();

    std::string getWlanIfaceNameWithType(IfaceType type, unsigned idx);

    void invalidateAndClearBridgedApAll();

    void invalidateAndClearBridgedAp(const std::string& br_name);

    void deleteApIface(const std::string& if_name);

    bool findUsingNameFromBridgedApInstances(const std::string& name);

    ndk::ScopedAStatus triggerSubsystemRestartInternal();

    std::pair<std::vector<WifiRadioCombination>, ndk::ScopedAStatus>