Merge "[AWARE]: Add range report in SDEA params" am: 1da29541bc

am: eaed213c02

Change-Id: Iee364e94f6a004a46d4d13e18be64bce4d39239c
This commit is contained in:
Etan Cohen 2017-03-09 23:21:31 +00:00 committed by android-build-merger
commit 93dea20a32

View file

@ -285,6 +285,11 @@ typedef struct {
if ranging is enabled on disabled
*/
NanRangingState ranging_state;
/*
Enable/Disable Ranging report,
when configured NanRangeReportInd received
*/
NanRangeReport range_report;
} NanSdeaCtrlParams;
/*
@ -1036,9 +1041,6 @@ typedef struct {
/* Enable/disable NAN serivce Ranging auto response mode */
NanRangingAutoResponse ranging_auto_response;
/* Enable/Disable Ranging report, when configured NanRangeReportInd received */
NanRangeReport range_report;
/*
When the ranging_auto_response_cfg is not set, NanRangeRequestInd is
received. Nan Range Response to Peer MAC Addr is notified to indicate
@ -1203,9 +1205,6 @@ typedef struct {
/* Enable/disable NAN serivce Ranging auto response mode */
NanRangingAutoResponse ranging_auto_response;
/* Enable/Disable Ranging report, when configured NanRangeReportInd received */
NanRangeReport range_report;
/*
When the ranging_auto_response_cfg is not set, NanRangeRequestInd is
received. Nan Range Response to Peer MAC Addr is notified to indicate