Fix unit test failures on Android 17 (package name check & OpenSL ES FullDuplex FIFO) (#2422)
diff --git a/tests/testFullDuplexStream.cpp b/tests/testFullDuplexStream.cpp
index b8b9688..8b1feae 100644
--- a/tests/testFullDuplexStream.cpp
+++ b/tests/testFullDuplexStream.cpp
@@ -65,7 +65,9 @@
mInputBuilder.setPerformanceMode(inputPerfMode);
mInputBuilder.setChannelCount(1);
mInputBuilder.setFormat(AudioFormat::Float);
- mInputBuilder.setBufferCapacityInFrames(mOutputStream->getBufferCapacityInFrames() * 2);
+ mInputBuilder.setBufferCapacityInFrames(
+ std::max(mOutputStream->getBufferCapacityInFrames() * 2,
+ mOutputStream->getFramesPerBurst() * 8));
mInputBuilder.setSampleRate(mOutputStream->getSampleRate());
r = mInputBuilder.openStream(mInputStream);
diff --git a/tests/testStreamOpen.cpp b/tests/testStreamOpen.cpp
index fda9606..dba35d9 100644
--- a/tests/testStreamOpen.cpp
+++ b/tests/testStreamOpen.cpp
@@ -451,9 +451,11 @@
mBuilder.setDirection(Direction::Input);
mBuilder.setAudioApi(AudioApi::AAudio);
mBuilder.setPackageName("com.google.oboe.tests.unittestrunnerinvalid");
- ASSERT_TRUE(openStream());
- ASSERT_NE(mStream->requestStart(), Result::OK);
- ASSERT_TRUE(closeStream());
+ Result r = mBuilder.openStream(mStream);
+ if (r == Result::OK) {
+ ASSERT_NE(mStream->requestStart(), Result::OK);
+ ASSERT_TRUE(closeStream());
+ }
}
}