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

Commit 0fc3d44f authored by Jaideep Sharma's avatar Jaideep Sharma
Browse files

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
parent 494d36a9

media/libaudiohal/impl/StreamHalAidl.cpp

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,9 @@ status_t StreamHalAidl::standby() { 
            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;