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

Commit c6eabcd4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "remove redundent conflict checking" into main

parents 7db5a528 751675a1

system/gd/hci/distance_measurement_manager.cc

+0 −8
Original line number Diff line number Diff line
@@ -1003,14 +1003,6 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
        distance_measurement_callbacks_->OnDistanceMeasurementStarted(live_tracker->address,

                                                                      METHOD_CS);

      }

      // cs role switch from requester to responder, may reset the config if conflict.

      if (!live_tracker->local_start &&

          cs_requester_trackers_.find(connection_handle) != cs_requester_trackers_.end() &&

          cs_requester_trackers_[connection_handle].config_id == live_tracker->config_id) {

        log::debug("config id {} from remote is the same as the cached local, reset config_set.",

                   cs_requester_trackers_[connection_handle].config_id);

        cs_requester_trackers_[connection_handle].config_set = false;

      }

    } else if (event_view.GetState() == Enable::DISABLED) {

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

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