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

Commit 5d57ab1a authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "VtsHalBluetoothV1: Always wait for completed packets"

parents 79cb2958 a794f831

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp

+9 −6
Original line number Diff line number Diff line
@@ -516,12 +516,15 @@ void BluetoothHidlTest::sendAndCheckACL(int num_packets, size_t size, 
// Return the number of completed packets reported by the controller.

int BluetoothHidlTest::wait_for_completed_packets_event(uint16_t handle) {

  int packets_processed = 0;

  wait_for_event(false);

  if (event_queue.size() == 0) {

  while (true) {

    // There should be at least one event.

    wait_for_event(packets_processed == 0);

    if (event_queue.empty()) {

      if (packets_processed == 0) {

        ALOGW("%s: WaitForCallback timed out.", __func__);

      }

      return packets_processed;

    }

  while (event_queue.size() > 0) {

    hidl_vec<uint8_t> event = event_queue.front();

    event_queue.pop();

bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp

+9 −6
Original line number Diff line number Diff line
@@ -539,12 +539,15 @@ void BluetoothHidlTest::sendAndCheckACL(int num_packets, size_t size, 
// Return the number of completed packets reported by the controller.

int BluetoothHidlTest::wait_for_completed_packets_event(uint16_t handle) {

  int packets_processed = 0;

  wait_for_event(false);

  if (event_queue.size() == 0) {

  while (true) {

    // There should be at least one event.

    wait_for_event(packets_processed == 0);

    if (event_queue.empty()) {

      if (packets_processed == 0) {

        ALOGW("%s: WaitForCallback timed out.", __func__);

      }

      return packets_processed;

    }

  while (event_queue.size() > 0) {

    hidl_vec<uint8_t> event = event_queue.front();

    event_queue.pop();