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

Commit 4ad7daa9 authored by Nate Jiang's avatar Nate Jiang
Browse files

IWifi: Validate dedicated NAN discovery interface. 

Bug: 156879576
Test: atest android.hardware.wifi@1.0-service-tests
Change-Id: I9150b683ceb5631139eab6e0c6c8edb4209c9493
parent 03859a7c

wifi/1.4/default/wifi_chip.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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();