Merge "IWifi: Validate dedicated NAN discovery interface." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-20 03:14:36 +00:00
committed by Android (Google) Code Review

View File

@@ -19,6 +19,7 @@
#include <android-base/logging.h>
#include <android-base/unique_fd.h>
#include <cutils/properties.h>
#include <net/if.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
@@ -885,7 +886,7 @@ std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::createNanIfaceInternal() {
}
bool is_dedicated_iface = true;
std::string ifname = getNanIfaceName();
if (ifname.empty()) {
if (ifname.empty() || if_nametoindex(ifname.c_str())) {
// Use the first shared STA iface (wlan0) if a dedicated aware iface is
// not defined.
ifname = getFirstActiveWlanIfaceName();