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

Commit 01f2b8aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal: Fix Standby sequence" into main am: 9bf022b4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3333475



Change-Id: Ia844d2d0bd9c679dc1c02102022550fa6ad93977
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bba3db6 9bf022b4

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;