commit 9424e9d541f6bb0a8f98b83b96fd30e21dea6e71
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 16 00:04:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 16 00:04:36 2017 +0000
tree e6130554b335150e629ec1f377cb3488f018687f
parent ada528db46ad9c3b16c007855f24bb36f3ae2b35
parent c4d9f87f66130c1e0b598fd0903ea2f99e8dfb5e

Merge "[AWARE] Actually shut-down functionality when destroying NAN iface" into oc-dr1-dev

wifi/1.0/default/wifi_nan_iface.cpp

diff --git a/wifi/1.0/default/wifi_nan_iface.cpp b/wifi/1.0/default/wifi_nan_iface.cpp
index 1072015..88fb5b2 100644
--- a/wifi/1.0/default/wifi_nan_iface.cpp
+++ b/wifi/1.0/default/wifi_nan_iface.cpp
@@ -420,6 +420,11 @@
 }
 
 void WifiNanIface::invalidate() {
+  // send commands to HAL to actually disable and destroy interfaces
+  legacy_hal_.lock()->nanDisableRequest(0xFFFF);
+  legacy_hal_.lock()->nanDataInterfaceDelete(0xFFFE, "aware_data0");
+  legacy_hal_.lock()->nanDataInterfaceDelete(0xFFFD, "aware_data1");
+
   legacy_hal_.reset();
   event_cb_handler_.invalidate();
   is_valid_ = false;