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

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

Merge "Correctly parse Command Complete and Status events with empty op_code"...

Merge "Correctly parse Command Complete and Status events with empty op_code" into main am: 9790da70 am: 6bc7e1e1

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3418955



Change-Id: I641f786a98e614c3288227e29f053b3c01159713
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 595bf5b8 6bc7e1e1
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;