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

Commit 4ef461ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Cancel inquiry timer on reset" am: 27a2dd2d 

Change-Id: If2042a5ca5f51b519cb875a2cad58be2e34fd7eb
parents ffb01722 27a2dd2d

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.cc

+13 −17
Original line number Diff line number Diff line
@@ -1028,8 +1028,7 @@ void LinkLayerController::IncomingPageResponsePacket( 
}



void LinkLayerController::TimerTick() {

  if (inquiry_state_ == Inquiry::InquiryState::INQUIRY) Inquiry();

  if (inquiry_state_ == Inquiry::InquiryState::INQUIRY) PageScan();

  if (inquiry_timer_task_id_ != kInvalidTaskId) Inquiry();

  LeAdvertising();

  Connections();

}
@@ -1129,11 +1128,6 @@ void LinkLayerController::RegisterTaskCancel( 
  cancel_task_ = task_cancel;

}



void LinkLayerController::AddControllerEvent(milliseconds delay,

                                             const TaskCallback& task) {

  controller_events_.push_back(ScheduleTask(delay, task));

}



void LinkLayerController::WriteSimplePairingMode(bool enabled) {

  ASSERT_LOG(enabled, "The spec says don't disable this!");

  simple_pairing_mode_enabled_ = enabled;
@@ -1780,29 +1774,31 @@ bool LinkLayerController::LeResolvingListFull() { 
}



void LinkLayerController::Reset() {

  inquiry_state_ = Inquiry::InquiryState::STANDBY;

  if (inquiry_timer_task_id_ != kInvalidTaskId) {

    CancelScheduledTask(inquiry_timer_task_id_);

    inquiry_timer_task_id_ = kInvalidTaskId;

  }

  last_inquiry_ = steady_clock::now();

  le_scan_enable_ = bluetooth::hci::OpCode::NONE;

  le_advertising_enable_ = 0;

  le_connect_ = 0;

}



void LinkLayerController::PageScan() {}



void LinkLayerController::StartInquiry(milliseconds timeout) {

  ScheduleTask(milliseconds(timeout),

               [this]() { LinkLayerController::InquiryTimeout(); });

  inquiry_state_ = Inquiry::InquiryState::INQUIRY;

  inquiry_timer_task_id_ = ScheduleTask(milliseconds(timeout), [this]() {

    LinkLayerController::InquiryTimeout();

  });

}



void LinkLayerController::InquiryCancel() {

  ASSERT(inquiry_state_ == Inquiry::InquiryState::INQUIRY);

  inquiry_state_ = Inquiry::InquiryState::STANDBY;

  ASSERT(inquiry_timer_task_id_ != kInvalidTaskId);

  CancelScheduledTask(inquiry_timer_task_id_);

  inquiry_timer_task_id_ = kInvalidTaskId;

}



void LinkLayerController::InquiryTimeout() {

  if (inquiry_state_ == Inquiry::InquiryState::INQUIRY) {

    inquiry_state_ = Inquiry::InquiryState::STANDBY;

  if (inquiry_timer_task_id_ != kInvalidTaskId) {

    inquiry_timer_task_id_ = kInvalidTaskId;

    auto packet =

        bluetooth::hci::InquiryCompleteBuilder::Create(ErrorCode::SUCCESS);

    send_event_(std::move(packet));

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.h

+1 −3
Original line number Diff line number Diff line
@@ -124,9 +124,7 @@ class LinkLayerController { 


  void RegisterTaskCancel(std::function<void(AsyncTaskId)> cancel);

  void Reset();

  void AddControllerEvent(std::chrono::milliseconds delay, const TaskCallback& task);



  void PageScan();

  void Connections();



  void LeAdvertising();
@@ -367,7 +365,7 @@ class LinkLayerController { 
  SecurityManager security_manager_{10};

  std::chrono::steady_clock::time_point last_inquiry_;

  model::packets::InquiryType inquiry_mode_;

  Inquiry::InquiryState inquiry_state_;

  AsyncTaskId inquiry_timer_task_id_ = kInvalidTaskId;

  uint64_t inquiry_lap_;

  uint8_t inquiry_max_responses_;