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

Commit b7e0b24c authored by Henri Chataing's avatar Henri Chataing Committed by Android Build Cherrypicker Worker
Browse files

Correctly parse Command Complete and Status events with empty op_code

Bug: 352247861
Test: atest VtsHalBluetoothTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:99062650c7a9afbafdd54399b7c097aaf40d7087)
Merged-In: I46b4f5895c042b299f6233c742250b4e18372f52
Change-Id: I46b4f5895c042b299f6233c742250b4e18372f52
parent 371c4d39
Loading
Loading
Loading
Loading
+11 −5
Original line number Diff line number Diff line
@@ -397,12 +397,18 @@ void BluetoothAidlTest::handle_no_ops() {
  while (!event_queue.empty()) {
    std::vector<uint8_t> event;
    event_queue.front(event);
    auto complete_view = ::bluetooth::hci::CommandCompleteView::Create(
        ::bluetooth::hci::EventView::Create(::bluetooth::hci::PacketView<true>(
            std::make_shared<std::vector<uint8_t>>(event))));
    auto status_view = ::bluetooth::hci::CommandCompleteView::Create(

    auto event_view =
        ::bluetooth::hci::EventView::Create(::bluetooth::hci::PacketView<true>(
            std::make_shared<std::vector<uint8_t>>(event))));
            std::make_shared<std::vector<uint8_t>>(event)));
    if (!event_view.IsValid()) {
      break;
    }

    auto status_view = ::bluetooth::hci::CommandStatusView::Create(event_view);
    auto complete_view =
        ::bluetooth::hci::CommandCompleteView::Create(event_view);

    bool is_complete_no_op =
        complete_view.IsValid() &&
        complete_view.GetCommandOpCode() == ::bluetooth::hci::OpCode::NONE;