From 4daf98327450aaf2556bb0e85386e7926104ee6b Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 9 Feb 2017 17:52:34 -0800 Subject: [PATCH] [AWARE] Update capabilties Update capability configuration to reflect added/remove fields: - Added extendedServiceSpecificInfo - Remove vendor-specific attribute (VSA) Bug: 35193423 Bug: 35193235 Test: unit tests and integration (sl4a) tests Change-Id: I0dad08ff9d16ea54f5db7303cc5f90e942f48037 --- wifi/1.0/default/hidl_struct_util.cpp | 2 +- wifi/1.0/types.hal | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index 2343c2ddf2..e57919d241 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -1278,7 +1278,7 @@ bool convertLegacyNanCapabilitiesResponseToHidl( 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; diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal index 8eb0c2f629..f7772079a0 100644 --- a/wifi/1.0/types.hal +++ b/wifi/1.0/types.hal @@ -1288,10 +1288,6 @@ struct NanCapabilities { * Maximum length (in bytes) of the extended service specific info field. */ 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. */