Merge "audiosystem_tests: Fix false test failures" into main am: 0561ea421b
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2977654
Change-Id: Ib53c0639595e9c6388c96648c3860764e4e67025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudioclient/tests/audio_test_utils.cpp b/media/libaudioclient/tests/audio_test_utils.cpp
index ee5489b..9a202cc3 100644
--- a/media/libaudioclient/tests/audio_test_utils.cpp
+++ b/media/libaudioclient/tests/audio_test_utils.cpp
@@ -565,12 +565,14 @@
int attempts = 5;
status_t status;
unsigned int generation1, generation;
- unsigned int numPorts = 0;
+ unsigned int numPorts;
do {
if (attempts-- < 0) {
status = TIMED_OUT;
break;
}
+ // query for number of ports.
+ numPorts = 0;
status = AudioSystem::listAudioPorts(AUDIO_PORT_ROLE_NONE, AUDIO_PORT_TYPE_NONE, &numPorts,
nullptr, &generation1);
if (status != NO_ERROR) {
@@ -622,12 +624,14 @@
int attempts = 5;
status_t status;
unsigned int generation1, generation;
- unsigned int numPatches = 0;
+ unsigned int numPatches;
do {
if (attempts-- < 0) {
status = TIMED_OUT;
break;
}
+ // query for number of patches.
+ numPatches = 0;
status = AudioSystem::listAudioPatches(&numPatches, nullptr, &generation1);
if (status != NO_ERROR) {
ALOGE("AudioSystem::listAudioPatches returned error %d", status);