Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c570eee authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl" am:... 

Merge "[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl" am: 255cdb29 am: 556b385f
am: 17ea7d90

Change-Id: I8ba8ebc238214879d6e4e53be32c2c7fb818b58b
parents ef4522ac 17ea7d90

wifi/1.0/default/hidl_struct_util.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 ?