Merge "[AWARE] Update capabilties" am: 10569b1bb4

am: dbaff93416

Change-Id: I874de1d8668ea0df50d0c84357469e719841c4f8
This commit is contained in:
Etan Cohen 2017-02-11 01:05:02 +00:00 committed by android-build-merger
commit 95e7e5a098
2 changed files with 1 additions and 5 deletions

View file

@ -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;

View file

@ -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.
*/