Blacklist nan interfaces for wificond

Bug: 37644243
Test: manual tests
Change-Id: Ia08cbd50e67b9c0d4ee1b5837c81001e33049936

1 files changed, 5 insertions, 1 deletions

diff --git a/server.cpp b/server.cpp
index 808f3bc..96a3ee8 100644
--- a/server.cpp
+++ b/server.cpp
@@ -20,6 +20,7 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <android-base/strings.h>
 #include <binder/IPCThreadState.h>
 #include <binder/PermissionCache.h>
 
@@ -260,7 +261,10 @@ bool Server::SetupInterface(InterfaceInfo* interface) {
     // Some kernel/driver uses station type for p2p interface.
     // In that case we can only rely on hard-coded name to exclude
     // p2p interface from station interfaces.
-    if (iface.name != "p2p0") {
+    // Currently NAN interfaces also use station type.
+    // We should blacklist NAN interfaces as well.
+    if (iface.name != "p2p0" &&
+        !android::base::StartsWith(iface.name, "aware_data")) {
       *interface = iface;
       return true;
     }