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

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

Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am:... 

Merge "Fix vts sco test fail for usb interface" into stage-aosp-udc-ts-dev am: bcd8ee70 am: 4ba38df7 am: 165f6b55

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



Change-Id: I19dfc835d53fc171a40acaae16a55040bbd3c17c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8f36f8e 165f6b55

bluetooth/aidl/vts/VtsHalBluetoothTargetTest.cpp

+23 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ class BluetoothAidlTest : public ::testing::TestWithParam<std::string> { 
  int wait_for_completed_packets_event(uint16_t handle);

  void send_and_wait_for_cmd_complete(std::unique_ptr<CommandBuilder> cmd,

                                      std::vector<uint8_t>& cmd_complete);

  void reassemble_sco_loopback_pkt(std::vector<uint8_t>& scoPackets,

    size_t size);



  // A simple test implementation of BluetoothHciCallbacks.

  class BluetoothHciCallbacks
@@ -569,6 +571,11 @@ void BluetoothAidlTest::sendAndCheckSco(int num_packets, size_t size, 
    ASSERT_TRUE(

        sco_queue.tryPopWithTimeout(sco_loopback, kWaitForScoDataTimeout));



    if (sco_loopback.size() < size) {

      // The packets may have been split for USB. Reassemble before checking.

      reassemble_sco_loopback_pkt(sco_loopback, size);

    }



    ASSERT_EQ(sco_packet, sco_loopback);

  }

  logger.setTotalBytes(num_packets * size * 2);
@@ -703,6 +710,22 @@ void BluetoothAidlTest::send_and_wait_for_cmd_complete( 
      wait_for_command_complete_event(view.GetOpCode(), cmd_complete));

}



// Handle the loopback packet.

void BluetoothAidlTest::reassemble_sco_loopback_pkt(std::vector<uint8_t>& scoPackets,

        size_t size) {

    std::vector<uint8_t> sco_packet_whole;

    sco_packet_whole.assign(scoPackets.begin(), scoPackets.end());

    while (size + 3 > sco_packet_whole.size()) {

      std::vector<uint8_t> sco_packets;

      ASSERT_TRUE(

      sco_queue.tryPopWithTimeout(sco_packets, kWaitForScoDataTimeout));

      sco_packet_whole.insert(sco_packet_whole.end(), sco_packets.begin() + 3,

          sco_packets.end());

    }

    scoPackets.assign(sco_packet_whole.begin(), sco_packet_whole.end());

    scoPackets[2] = size;

}



// Empty test: Initialize()/Close() are called in SetUp()/TearDown().

TEST_P(BluetoothAidlTest, InitializeAndClose) {}