Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e

am: f59832297f

Change-Id: Ia7aa6f16b189334f993436353e10b2b384b089b4
This commit is contained in:
Etan Cohen 2017-02-16 20:27:33 +00:00 committed by android-build-merger
commit 59d92fd2b4

View file

@ -1874,8 +1874,9 @@ typedef struct {
transaction_id id;
/*
Following reason codes returned:
NAN_STATUS_SUCCESS
NAN_STATUS_NO_OTA_ACK
NAN_STATUS_FOLLOWUP_QUEUE_FULL
NAN_STATUS_PROTOCOL_FAILURE
*/
NanStatusType reason;
char nan_reason[NAN_ERROR_STR_LEN]; /* Describe the NAN reason type */
@ -2178,8 +2179,10 @@ wifi_error nan_subscribe_cancel_request(transaction_id id,
* NAN_STATUS_INTERNAL_FAILURE
* NAN_STATUS_INVALID_PUBLISH_SUBSCRIBE_ID
* NAN_STATUS_INVALID_REQUESTOR_INSTANCE_ID
* @return Asynchronous TransmitFollowupInd CB return
* NAN_STATUS_FOLLOWUP_QUEUE_FULL
* @return Asynchronous TransmitFollowupInd CB return
* NAN_STATUS_SUCCESS
* NAN_STATUS_PROTOCOL_FAILURE
* NAN_STATUS_NO_OTA_ACK
*/
wifi_error nan_transmit_followup_request(transaction_id id,