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

Commit 382480fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "le_impl: Co-locate OnPause/OnResume" am: dbe8c7e1 

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

Change-Id: Ie3ad5faa2432a0419af85122cb6c55f384ee7b23
parents 3728ddae dbe8c7e1

system/gd/hci/acl_manager/le_impl.h

+10 −10
Original line number Diff line number Diff line
@@ -721,6 +721,16 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    le_address_manager_->AckPause(this);

  }



  void OnResume() override {

    pause_connection = false;

    if (!canceled_connections_.empty()) {

      create_le_connection(*canceled_connections_.begin(), false, false);

    }

    canceled_connections_.clear();

    le_address_manager_->AckResume(this);

    check_for_unregister();

  }



  void on_create_connection_cancel_complete(CommandCompleteView view) {

    auto complete_view = LeCreateConnectionCancelCompleteView::Create(view);

    ASSERT(complete_view.IsValid());
@@ -741,16 +751,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    }

  }



  void OnResume() override {

    pause_connection = false;

    if (!canceled_connections_.empty()) {

      create_le_connection(*canceled_connections_.begin(), false, false);

    }

    canceled_connections_.clear();

    le_address_manager_->AckResume(this);

    check_for_unregister();

  }



  uint16_t HACK_get_handle(Address address) {

    for (auto it = le_acl_connections_.begin(); it != le_acl_connections_.end(); it++) {

      if (it->second.remote_address_.GetAddress() == address) {