commit 2bfad0cf8215a70eb5eaa9cb66c80de647a28e2a
author Etan Cohen <etancohen@google.com> Tue Feb 21 05:47:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 21 05:47:03 2017 +0000
tree c6d6eea9fc5e412a98c2debd3c58882e32cb8aac
parent 10b0e0880cbfa4e84ad88c67126dc53588e07e8c
parent 09a604b41a8aef2427740a10c27cbd970807c0d7

Merge "[AWARE] Add capability info: max subscribe addresses"

wifi/1.0/default/hidl_struct_util.cpp

diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp
index 4dd1ba6..6c40c4b 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -1285,8 +1285,7 @@
   hidl_response->maxNdpSessions = legacy_response.max_ndp_sessions;
   hidl_response->maxAppInfoLen = legacy_response.max_app_info_len;
   hidl_response->maxQueuedTransmitFollowupMsgs = legacy_response.max_queued_transmit_followup_msgs;
-  // TODO: b/34059183 to add to underlying HAL
-  hidl_response->maxSubscribeInterfaceAddresses = NAN_MAX_SUBSCRIBE_MAX_ADDRESS;
+  hidl_response->maxSubscribeInterfaceAddresses = legacy_response.max_subscribe_address;
   hidl_response->supportedCipherSuites = legacy_response.cipher_suites_supported;
 
   return true;