commit 10569b1bb474462c79d86f02350c3ff14426561a
author Etan Cohen <etancohen@google.com> Sat Feb 11 00:58:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 11 00:58:36 2017 +0000
tree b821c96f34fa996f1177d3b78b6d6a41ca835617
parent ea8ff054fa0877a4431116f0c1e21e7728e9b7a6
parent 4daf98327450aaf2556bb0e85386e7926104ee6b

Merge "[AWARE] Update capabilties"

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 2343c2d..e57919d 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -1278,7 +1278,7 @@
   hidl_response->maxTotalMatchFilterLen = legacy_response.max_total_match_filter_len;
   hidl_response->maxServiceSpecificInfoLen = legacy_response.max_service_specific_info_len;
   // TODO: b/35193423 add support for extended service specific info
-  hidl_response->maxVsaDataLen = legacy_response.max_vsa_data_len;
+  hidl_response->maxExtendedServiceSpecificInfoLen = 0;
   hidl_response->maxNdiInterfaces = legacy_response.max_ndi_interfaces;
   hidl_response->maxNdpSessions = legacy_response.max_ndp_sessions;
   hidl_response->maxAppInfoLen = legacy_response.max_app_info_len;

wifi/1.0/types.hal

diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index 8eb0c2f..f777207 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -1289,10 +1289,6 @@
    */
   uint32_t maxExtendedServiceSpecificInfoLen;
   /**
-   * Maximum length (in bytes) of vendor-specific (VSA) data.
-   */
-  uint32_t maxVsaDataLen;
-  /**
    * Maximum number of data interfaces (NDI) which can be created concurrently on the device.
    */
   uint32_t maxNdiInterfaces;