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

Commit 484c74e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix the condition check" into main am: 31f8b078 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3391388



Change-Id: I84adfaec254c7577a38163fc92744d4f6fe19199
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af11b66a 31f8b078

system/gd/hci/distance_measurement_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
  void start_distance_measurement_with_cs(const Address& cs_remote_address,

                                          uint16_t connection_handle) {

    log::info("connection_handle: {}, address: {}", connection_handle, cs_remote_address);

    if (!com::android::bluetooth::flags::channel_sounding_in_stack() && !is_local_cs_ready_) {

    if (!com::android::bluetooth::flags::channel_sounding_in_stack() || !is_local_cs_ready_) {

      log::error("Channel Sounding is not enabled");

      distance_measurement_callbacks_->OnDistanceMeasurementStopped(

              cs_remote_address, REASON_INTERNAL_ERROR, METHOD_CS);