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

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

Merge "gd test: Enqueue data/command in right order"

parents af7139da b037ece8

system/gd/hci/acl_manager_test.cc

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

      common::ContextualOnceCallback<void(CommandStatusView)> on_status) override {

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

    command_status_callbacks.push_front(std::move(on_status));

    command_status_callbacks.push_back(std::move(on_status));

    if (command_promise_ != nullptr) {

      command_promise_->set_value();

      command_promise_.reset();

system/gd/hci/hci_layer_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class TestHciHal : public hal::HciHal { 
  }



  void sendAclData(hal::HciPacket data) override {

    outgoing_acl_.push_front(std::move(data));

    outgoing_acl_.push_back(std::move(data));

    if (sent_acl_promise_ != nullptr) {

      auto promise = std::move(sent_acl_promise_);

      sent_acl_promise_.reset();
@@ -99,11 +99,11 @@ class TestHciHal : public hal::HciHal { 
  }



  void sendScoData(hal::HciPacket data) override {

    outgoing_sco_.push_front(std::move(data));

    outgoing_sco_.push_back(std::move(data));

  }



  void sendIsoData(hal::HciPacket data) override {

    outgoing_iso_.push_front(std::move(data));

    outgoing_iso_.push_back(std::move(data));

    if (sent_iso_promise_ != nullptr) {

      auto promise = std::move(sent_iso_promise_);

      sent_iso_promise_.reset();

system/gd/hci/le_address_manager_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class TestHciLayer : public HciLayer { 
      common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {

    std::lock_guard<std::mutex> lock(mutex_);

    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();

system/gd/hci/le_scanning_manager_test.cc

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

      common::ContextualOnceCallback<void(CommandStatusView)> on_status) override {

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

    command_status_callbacks.push_front(std::move(on_status));

    command_status_callbacks.push_back(std::move(on_status));

    if (command_promise_ != nullptr) {

      command_promise_->set_value();

      command_promise_.reset();
@@ -83,7 +83,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();