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

Commit 451a88c4 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "HCI: Discard events that come after timeouts" am: 7e3f1dca am:... 

Merge "HCI: Discard events that come after timeouts" am: 7e3f1dca am: bb6bf788 am: 1ab90d1e am: b0d718b1

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



Change-Id: I58cfce02810dc6e970740be316cdc55efe400aa4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c29a913 b0d718b1

system/gd/hci/hci_layer.cc

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ struct HciLayer::impl { 


    ASSERT_LOG(!command_queue_.empty(), "Unexpected %s event with OpCode 0x%02hx (%s)", logging_id.c_str(), op_code,

               OpCodeText(op_code).c_str());

    if (waiting_command_ == OpCode::CONTROLLER_DEBUG_INFO && op_code != OpCode::CONTROLLER_DEBUG_INFO) {

      LOG_ERROR("Discarding event that came after timeout 0x%02hx (%s)", op_code, OpCodeText(op_code).c_str());

      return;

    }

    ASSERT_LOG(waiting_command_ == op_code, "Waiting for 0x%02hx (%s), got 0x%02hx (%s)", waiting_command_,

               OpCodeText(waiting_command_).c_str(), op_code, OpCodeText(op_code).c_str());