Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "VtsHalBluetoothV1: Always wait for completed packets" am: 5d57ab1a45 am: 1b3643dd0f am: 596557ff32

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

Change-Id: I1a125b24f45e7102528d6c827ecc24f5d6903f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Myles Watson
2023-03-03 17:35:25 +00:00
committed by Automerger Merge Worker
parent 1794913d24 596557ff32
commit 596346b242
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
View File

@@ -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) {
ALOGW("%s: WaitForCallback timed out.", __func__);
return packets_processed;
}
while (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;
}
hidl_vec<uint8_t> event = event_queue.front();
event_queue.pop();

15
bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp
View File

@@ -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) {
ALOGW("%s: WaitForCallback timed out.", __func__);
return packets_processed;
}
while (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;
}
hidl_vec<uint8_t> event = event_queue.front();
event_queue.pop();