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

am: 1265f81d3d

Change-Id: Ieeee69556c5d4462cc1b721075498d6cbf6721f9
This commit is contained in:
Etan Cohen 2017-02-21 17:58:45 +00:00 committed by android-build-merger
commit b19e68fd60

View file

@ -1285,8 +1285,7 @@ bool convertLegacyNanCapabilitiesResponseToHidl(
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;