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

Commit 66e513d5 authored by Les Lee's avatar Les Lee Committed by Android (Google) Code Review
Browse files

Merge "wifi: Fix bridged interface property and allociation"

parents 6e46896d 5a46c958

wifi/1.5/default/wifi_chip.cpp

+4 −4
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ std::vector<std::string> getPredefinedApIfaceNames(bool is_bridged) { 
    ifnames.push_back(buffer.data());

    if (is_bridged) {

        buffer.fill(0);

        if (property_get("ro.vendor.wifi.sap.concurrent.interface",

                         buffer.data(), nullptr) == 0) {

        if (property_get("ro.vendor.wifi.sap.concurrent.iface", buffer.data(),

                         nullptr) == 0) {

            return ifnames;

        }

        ifnames.push_back(buffer.data());
@@ -1841,8 +1841,8 @@ std::vector<std::string> WifiChip::allocateBridgedApInstanceNames() { 
    } else {

        int num_ifaces_need_to_allocate = 2 - instances.size();

        for (int i = 0; i < num_ifaces_need_to_allocate; i++) {

            std::string instance_name =

                allocateApOrStaIfaceName(IfaceType::AP, startIdxOfApIface());

            std::string instance_name = allocateApOrStaIfaceName(

                IfaceType::AP, startIdxOfApIface() + i);

            if (!instance_name.empty()) {

                instances.push_back(instance_name);

            }