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

Commit 9ae634a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't log the head of an empty list" am: d6cbecce am: 5d64b679 am:... 

Merge "Don't log the head of an empty list" am: d6cbecce am: 5d64b679 am: b93d0bdc am: cbc9000f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1783812

Change-Id: I735715f7550caeeb7394019f18a914464c9602de
parents ad0e987b cbc9000f

system/gd/hci/hci_layer.cc

+6 −1
Original line number Diff line number Diff line
@@ -308,7 +308,12 @@ struct HciLayer::impl { 


  void on_hci_event(EventView event) {

    ASSERT(event.IsValid());

    if (command_queue_.empty()) {

      std::unique_ptr<CommandView> no_waiting_command{nullptr};

      log_hci_event(no_waiting_command, event, module_.GetDependency<storage::StorageModule>());

    } else {

      log_hci_event(command_queue_.front().command_view, event, module_.GetDependency<storage::StorageModule>());

    }

    EventCode event_code = event.GetEventCode();

    // Root Inflamation is a special case, since it aborts here

    if (event_code == EventCode::VENDOR_SPECIFIC) {