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

Commit af93b43c authored by Chienyuan Huang's avatar Chienyuan Huang
Browse files

CS: Fix null pointer dereference when stop_distance_measurement 

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 369963781
Test: m com.android.btservice
Change-Id: Id9532afe0a7beb1d59b08029b124aeb46a4e8450
parent dcfef627

system/gd/hci/distance_measurement_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
      case METHOD_CS: {

        if (cs_trackers_.find(connection_handle) == cs_trackers_.end()) {

          log::warn("Can't find CS tracker for {}", address);

        } else {

        } else if (cs_trackers_[connection_handle].measurement_ongoing) {

          cs_trackers_[connection_handle].repeating_alarm->Cancel();

          send_le_cs_procedure_enable(connection_handle, Enable::DISABLED);

        }