commit 63f34eda73f1a431f2207d8a6ca33d182e1bb4a1
author Nate Jiang <qiangjiang@google.com> Wed May 20 23:22:51 2020 -0700
committer Nate Jiang <qiangjiang@google.com> Thu May 21 00:01:51 2020 -0700
tree b3f1bf01b4e502d01e4565804811e6fcc6e27cc9
parent c669b6bd899f6c8aea9771de9a1ddc03d073d7de

Fix NAN validate interface existence

Bug: 156879576
Test: atest android.hardware.wifi@1.0-service-tests

Change-Id: I8505e343f5b2ea5ea522cbb2ea344ff8914aea3d

wifi/1.4/default/wifi_chip.cpp

diff --git a/wifi/1.4/default/wifi_chip.cpp b/wifi/1.4/default/wifi_chip.cpp
index fa4f354..8747e61 100644
--- a/wifi/1.4/default/wifi_chip.cpp
+++ b/wifi/1.4/default/wifi_chip.cpp
@@ -19,7 +19,6 @@
 #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>
 
@@ -886,7 +885,7 @@
     }
     bool is_dedicated_iface = true;
     std::string ifname = getNanIfaceName();
-    if (ifname.empty() || if_nametoindex(ifname.c_str())) {
+    if (ifname.empty() || !iface_util_.lock()->ifNameToIndex(ifname)) {
         // Use the first shared STA iface (wlan0) if a dedicated aware iface is
         // not defined.
         ifname = getFirstActiveWlanIfaceName();