diff options
| author | Etan Cohen <etancohen@google.com> | 2017-03-08 11:44:01 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-03-08 11:44:01 -0800 |
| commit | 5b804210aec4556359ec887a1971c24b94c47ec8 (patch) | |
| tree | 032893a05dfb731e9e28ab5e2985a6dcc01de9d7 /wifi/1.0/default/hidl_struct_util.cpp | |
| parent | f297caedd7601d498c520a36010af999b259e284 (diff) | |
[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl
Relocate ranging report config in the legacy HAL. Match the correspoding
setting in the HIDL implementation (field itself not exposed).
Bug: 36065933
Test: integration (sl4a) tests
Change-Id: I651db9e8f63f8382706994d8b3b6cc266b77c73d
Diffstat (limited to 'wifi/1.0/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.0/default/hidl_struct_util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index 5917efc6b2..98a62bf013 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -987,7 +987,7 @@ bool convertHidlNanPublishRequestToLegacy( legacy_request->ranging_cfg.distance_egress_cm = hidl_request.baseConfigs.distanceEgressCm; legacy_request->ranging_auto_response = hidl_request.baseConfigs.rangingRequired ? legacy_hal::NAN_RANGING_AUTO_RESPONSE_ENABLE : legacy_hal::NAN_RANGING_AUTO_RESPONSE_DISABLE; - legacy_request->range_report = legacy_hal::NAN_DISABLE_RANGE_REPORT; + legacy_request->sdea_params.range_report = legacy_hal::NAN_DISABLE_RANGE_REPORT; legacy_request->publish_type = (legacy_hal::NanPublishType) hidl_request.publishType; legacy_request->tx_type = (legacy_hal::NanTxType) hidl_request.txType; legacy_request->service_responder_policy = hidl_request.autoAcceptDataPathRequests ? @@ -1080,7 +1080,7 @@ bool convertHidlNanSubscribeRequestToLegacy( legacy_request->ranging_cfg.distance_egress_cm = hidl_request.baseConfigs.distanceEgressCm; legacy_request->ranging_auto_response = hidl_request.baseConfigs.rangingRequired ? legacy_hal::NAN_RANGING_AUTO_RESPONSE_ENABLE : legacy_hal::NAN_RANGING_AUTO_RESPONSE_DISABLE; - legacy_request->range_report = legacy_hal::NAN_DISABLE_RANGE_REPORT; + legacy_request->sdea_params.range_report = legacy_hal::NAN_DISABLE_RANGE_REPORT; legacy_request->subscribe_type = (legacy_hal::NanSubscribeType) hidl_request.subscribeType; legacy_request->serviceResponseFilter = (legacy_hal::NanSRFType) hidl_request.srfType; legacy_request->serviceResponseInclude = hidl_request.srfRespondIfInAddressSet ? |