commit f621f86fd2c1326d13e85c739dd02bc3ed810274
author Xin Li <delphij@google.com> Wed Oct 30 16:01:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 16:01:55 2019 -0700
tree 33c2e88f3ff23a1620fc15a2011c11c781fd7148
parent 6bb7a2f5a3d9daea9b10e20d1c568f49b01a2e81
parent 10ea32d47069eb026f822e30a9a23be9d0345ca1

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e370a75148
am: 10ea32d470 -s ours
am skip reason: subject contains skip directive

Change-Id: I13be2168c9a81288713e1d010d54de24d0aac3e8

qcwcn/wifi_hal/nan.cpp

diff --git a/qcwcn/wifi_hal/nan.cpp b/qcwcn/wifi_hal/nan.cpp
index 549b381..ac378fa 100644
--- a/qcwcn/wifi_hal/nan.cpp
+++ b/qcwcn/wifi_hal/nan.cpp
@@ -1260,6 +1260,7 @@
         //error case should not happen print log
         ALOGE("%s: Wrong NAN subcmd received %d", __FUNCTION__, mSubcmd);
     }
+    mNanVendorEvent = NULL;
     return NL_SKIP;
 }
 

qcwcn/wifi_hal/nan_rsp.cpp

diff --git a/qcwcn/wifi_hal/nan_rsp.cpp b/qcwcn/wifi_hal/nan_rsp.cpp
index 721ab49..f0b9b1c 100644
--- a/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/qcwcn/wifi_hal/nan_rsp.cpp
@@ -350,7 +350,7 @@
     char tlvInfo[NAN_ERROR_STR_LEN];
     tlvInfo[0] = '\0';
 
-    if (isNanResponse() || (is_ndp_rsp == true)){
+    if ((is_ndp_rsp == true) || isNanResponse()) {
         pRsp = (NanResponseMsg*)pResponse;
         for (i = 0; i < (int)(sizeof(errorCodeTranslation)/ sizeof(errorCode)); i++) {
             if (errorCodeTranslation[i].firmwareError == firmwareErrorRecvd) {