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

Commit 444473fb authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi(implementation): Simplify getFirstActiveWlanIfaceName 

Get rid of the unnecessary looping inside the method which was causing a
bunch of unnecessary selinux denial logs.

Bug: 130384921
Test: ./data/android.hardware.wifi@1.0-service-tests
Test: Manually verified the property name after wifi on/off & softap
on/off.

Change-Id: Ia9f61749b2017234851d67b027deb685cb8b539e
parent 014dd02f

wifi/1.3/default/wifi_chip.cpp

+3 −6
Original line number Diff line number Diff line
@@ -1436,14 +1436,11 @@ bool WifiChip::isStaApConcurrencyAllowedInCurrentMode() { 
}



std::string WifiChip::getFirstActiveWlanIfaceName() {

    for (unsigned idx = 0; idx < kMaxWlanIfaces; idx++) {

        const auto ifname = getWlanIfaceName(idx);

        if (findUsingName(sta_ifaces_, ifname)) return ifname;

        if (findUsingName(ap_ifaces_, ifname)) return ifname;

    }

    if (sta_ifaces_.size() > 0) return sta_ifaces_[0]->getName();

    if (ap_ifaces_.size() > 0) return ap_ifaces_[0]->getName();

    // This could happen if the chip call is made before any STA/AP

    // iface is created. Default to wlan0 for such cases.

    LOG(WARNING) << "No active wlan interfaces in use!";

    LOG(WARNING) << "No active wlan interfaces in use! Using default";

    return getWlanIfaceName(0);

}