commit 0fc3d44f3299ffb9317142272982f21ed879407a
author Jaideep Sharma <quic_jaidshar@quicinc.com> Tue Nov 05 15:50:21 2024 +0530
committer Jaideep Sharma <quic_jaidshar@quicinc.com> Thu Nov 07 02:01:05 2024 +0000
tree e8f9d6fcf456f370c590328c04217e5faaf5e61d
parent 494d36a9017329cb0558eec0c0dfbba41fd293a9

libaudiohal: Fix Standby sequence

If stream is in DRAINING state and standby is received then it is paused first. However, as DRAINING is a transient state for which HAL will be moved to IDLE on next cycle/trasient timeout. So, even after pause, stream can stay in IDLE state.

Allow reply.state to in IDLE after pause command (which is possible if original HAL state is DRAINING) so later flush,
standby sequence can be executed as part of intended fallthrough.

Bug: 377443079

Test: Oboe Tester -> open ->start -> stop, check logs for standby
Test: run cts-dev -m CtsNativeMediaAAudioTestCases

Change-Id: I882fd90c3bc49bfc40fecec169406b8ef88ecf2d

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index 0d65f8c..e138cea 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -232,7 +232,9 @@
             RETURN_STATUS_IF_ERROR(pause(&reply));
             if (reply.state != StreamDescriptor::State::PAUSED &&
                     reply.state != StreamDescriptor::State::DRAIN_PAUSED &&
-                    reply.state != StreamDescriptor::State::TRANSFER_PAUSED) {
+                    reply.state != StreamDescriptor::State::TRANSFER_PAUSED &&
+                    (state != StreamDescriptor::State::DRAINING ||
+                        reply.state != StreamDescriptor::State::IDLE)) {
                 AUGMENT_LOG(E, "unexpected stream state: %s (expected PAUSED)",
                             toString(reply.state).c_str());
                 return INVALID_OPERATION;