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

Commit af7139da authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "gd acl: Only ack pause when onPause"

parents 06497da6 4b339b0c

system/gd/hci/acl_manager/le_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    le_acl_connection_interface_->EnqueueCommand(

        LeCreateConnectionCancelBuilder::Create(),

        handler_->BindOnce(&le_impl::on_create_connection_cancel_complete, common::Unretained(this)));

    le_address_manager_->AckPause(this);

  }



  void on_create_connection_cancel_complete(CommandCompleteView view) {
@@ -604,7 +605,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
      std::string error_code = ErrorCodeText(status);

      LOG_WARN("Received on_create_connection_cancel_complete with error code %s", error_code.c_str());

    }

    le_address_manager_->AckPause(this);

  }



  void check_for_unregister() {

system/gd/hci/acl_manager_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class TestHciLayer : public HciLayer { 
      std::unique_ptr<CommandBuilder> command,

      common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {

    command_queue_.push(std::move(command));

    command_complete_callbacks.push_front(std::move(on_complete));

    command_complete_callbacks.push_back(std::move(on_complete));

    if (command_promise_ != nullptr) {

      command_promise_->set_value();

      command_promise_.reset();