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

Commit e58a94fc authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge changes I35da58e4,Ib31c9c6c into main am: 3b49e3c0 

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



Change-Id: I20b4eaf2c0fe4412c9f88b8b0e570cdf6c7b5501
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 797c4a01 3b49e3c0

system/gd/hci/acl_manager/acl_scheduler.cc

+9 −8
Original line number Diff line number Diff line
@@ -162,17 +162,18 @@ struct AclScheduler::impl { 
  void Stop() { stopped_ = true; }



private:

  bool is_ready_to_send_next_operation() const {

    return incoming_connecting_address_set_.empty() && !outgoing_entry_.has_value() &&

           !pending_outgoing_operations_.empty();

  }



  void try_dequeue_next_operation() {

  bool ready_to_send_next_operation() const {

    if (stopped_) {

      return;

      return false;

    }

    if (pending_outgoing_operations_.empty()) {

      return false;

    }

    return incoming_connecting_address_set_.empty() && !outgoing_entry_.has_value();

  }



    if (is_ready_to_send_next_operation()) {

  void try_dequeue_next_operation() {

    if (ready_to_send_next_operation()) {

      log::info("Pending connections is not empty; so sending next connection");

      auto entry = std::move(pending_outgoing_operations_.front());

      pending_outgoing_operations_.pop_front();