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

Commit 9f954b1b authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Automerger Merge Worker
Browse files

Merge "CS: only read vendor specific data when CS flag enabled" into main am: e64ae6af 

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



Change-Id: I9d3b8ef2bcb1f143b82db97b9a04d24778a06b76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e9e512a e64ae6af

system/gd/hci/distance_measurement_manager.cc

+8 −6
Original line number Original line Diff line number Diff line
@@ -231,14 +231,16 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 




  void register_distance_measurement_callbacks(DistanceMeasurementCallbacks* callbacks) {

  void register_distance_measurement_callbacks(DistanceMeasurementCallbacks* callbacks) {

    distance_measurement_callbacks_ = callbacks;

    distance_measurement_callbacks_ = callbacks;

    if (ranging_hal_->IsBound()) {

    if (com::android::bluetooth::flags::channel_sounding_in_stack() && ranging_hal_->IsBound()) {

      distance_measurement_callbacks_->OnVendorSpecificCharacteristics(

      auto vendor_specific_data = ranging_hal_->GetVendorSpecificCharacteristics();

          ranging_hal_->GetVendorSpecificCharacteristics());

      if (!vendor_specific_data.empty()) {

        distance_measurement_callbacks_->OnVendorSpecificCharacteristics(vendor_specific_data);

      }

    }

    }

  }

  }





  void start_distance_measurement(

  void start_distance_measurement(const Address address, uint16_t interval,

      const Address& address, uint16_t interval, DistanceMeasurementMethod method) {

                                  DistanceMeasurementMethod method) {

    log::info("Address:{}, method:{}", address, method);

    log::info("Address:{}, method:{}", address, method);

    uint16_t connection_handle = acl_manager_->HACK_GetLeHandle(address);

    uint16_t connection_handle = acl_manager_->HACK_GetLeHandle(address);
@@ -328,7 +330,7 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
        std::chrono::milliseconds(cs_trackers_[connection_handle].interval_ms));

        std::chrono::milliseconds(cs_trackers_[connection_handle].interval_ms));

  }

  }





  void stop_distance_measurement(const Address& address, DistanceMeasurementMethod method) {

  void stop_distance_measurement(const Address address, DistanceMeasurementMethod method) {

    log::info("Address:{}, method:{}", address, method);

    log::info("Address:{}, method:{}", address, method);

    switch (method) {

    switch (method) {

      case METHOD_AUTO:

      case METHOD_AUTO: