tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "wifi(implementation): Simplify getFirstActiveWlanIfaceName" into qt-dev

Browse source
This commit is contained in:
TreeHugger Robot 2019-04-23 06:14:19 +00:00 committed by Android (Google) Code Review
commit 2f40bd0697
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wifi/1.3/default/wifi_chip.cpp
View file

@ -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);
}