commit adce22ea9dced3fd85e4376ad3f180f36296d80c
author Nate Jiang <qiangjiang@google.com> Thu Aug 27 20:46:28 2020 +0000
committer Nate Jiang <qiangjiang@google.com> Thu Aug 27 20:46:32 2020 +0000
tree 57897717b3dd171728f7898b398bbf5fb6f68436
parent 3b26edb96827dcb628268458e766262d687cfdf7
parent 0bb061f863122431ae70928957a2df221c54b1d6

resolve merge conflicts of 0bb061f863122431ae70928957a2df221c54b1d6 to master

Change-Id: I0b13f3fc6edcfb2d5982ec13728753906f158c30

wifi/1.5/default/wifi_nan_iface.cpp

diff --git a/wifi/1.5/default/wifi_nan_iface.cpp b/wifi/1.5/default/wifi_nan_iface.cpp
index 84fb558..e2b0332 100644
--- a/wifi/1.5/default/wifi_nan_iface.cpp
+++ b/wifi/1.5/default/wifi_nan_iface.cpp
@@ -534,6 +534,9 @@
 }
 
 void WifiNanIface::invalidate() {
+    if (!isValid()) {
+        return;
+    }
     // send commands to HAL to actually disable and destroy interfaces
     legacy_hal_.lock()->nanDisableRequest(ifname_, 0xFFFF);
     legacy_hal_.lock()->nanDataInterfaceDelete(ifname_, 0xFFFE, "aware_data0");