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

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

Merge "CS: Do not omit any CS subevents when sending CS enable" into main am: 49e598dc 

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



Change-Id: Ibb1b112dcb46f9f7d32d82897b898ee912abda4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67729c7e 49e598dc

system/gd/hci/distance_measurement_manager.cc

+2 −0
Original line number Diff line number Diff line
@@ -1234,6 +1234,8 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
    CsTracker* live_tracker = nullptr;

    CsProcedureData* procedure_data = nullptr;

    uint8_t valid_requester_states = static_cast<uint8_t>(CsTrackerState::STARTED);

    // TODO(b/384928509): Prevent sending CS enable if procedures are not yet complete.

    valid_requester_states |= static_cast<uint8_t>(CsTrackerState::WAIT_FOR_PROCEDURE_ENABLED);

    uint8_t valid_responder_states = static_cast<uint8_t>(CsTrackerState::STARTED);

    if (event.GetSubeventCode() == SubeventCode::LE_CS_SUBEVENT_RESULT) {

      auto cs_event_result = LeCsSubeventResultView::Create(event);