commit 18b38eb441b35d0982c578706353c4fc0ca8687a
author Nate(Qiang) Jiang <qiangjiang@google.com> Wed Dec 11 12:48:13 2019 -0800
committer Nate Jiang <qiangjiang@google.com> Thu Dec 12 18:51:37 2019 +0000
tree d8c2c55dec140957f10fc3ca00227a56035a42a7
parent 463f1a18fd9b882b3fb9965cd5c77fb19e6a7b94

Fix 6GHz support for NAN

add NAN 6Ghz support in 1.4, size of bandSpecificConfig should be 3.

Bug: 146062988
Test: unit test
Test: acts AttachTest DiscoveryTest DataPathTest

Change-Id: I3bd0a4f32d804eae848bc15d9813d5ccb3e5fc62

wifi/1.4/default/hidl_struct_util.cpp

diff --git a/wifi/1.4/default/hidl_struct_util.cpp b/wifi/1.4/default/hidl_struct_util.cpp
index a7c5686..45ffdde 100644
--- a/wifi/1.4/default/hidl_struct_util.cpp
+++ b/wifi/1.4/default/hidl_struct_util.cpp
@@ -1135,9 +1135,9 @@
     legacy_request->disc_mac_addr_rand_interval_sec =
         hidl_request.configParams.macAddressRandomizationIntervalSec;
     legacy_request->config_2dot4g_rssi_close = 1;
-    if (hidl_request.configParams.bandSpecificConfig.size() != 2) {
+    if (hidl_request.configParams.bandSpecificConfig.size() != 3) {
         LOG(ERROR) << "convertHidlNanEnableRequestToLegacy: "
-                      "bandSpecificConfig.size() != 2";
+                      "bandSpecificConfig.size() != 3";
         return false;
     }
     legacy_request->rssi_close_2dot4g_val =