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

Commit 751675a1 authored by Steven Liu's avatar Steven Liu
Browse files

remove redundent conflict checking 

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 368617974
Test: m com.android.btservices

Change-Id: I1fc29c3e01ae6b39ea02bb5ff9ffddfd931ef654
parent a89b1a9f

system/gd/hci/distance_measurement_manager.cc

+0 −8
Original line number Diff line number Diff line
@@ -974,14 +974,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);