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

Commit 38801f75 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "allow standby function in the DRAINING and TRANSFERRING states" into main am: e7e84f95 

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



Change-Id: I823ea82f0096e56f9be8089e94b0cbcf769a9a94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cba93900 e7e84f95

media/libaudiohal/impl/StreamHalAidl.cpp

+6 −1
Original line number Diff line number Diff line
@@ -200,8 +200,12 @@ status_t StreamHalAidl::standby() { 
    StreamDescriptor::Reply reply;

    switch (state) {

        case StreamDescriptor::State::ACTIVE:

        case StreamDescriptor::State::DRAINING:

        case StreamDescriptor::State::TRANSFERRING:

            RETURN_STATUS_IF_ERROR(pause(&reply));

            if (reply.state != StreamDescriptor::State::PAUSED) {

            if (reply.state != StreamDescriptor::State::PAUSED &&

                    reply.state != StreamDescriptor::State::DRAIN_PAUSED &&

                    reply.state != StreamDescriptor::State::TRANSFER_PAUSED) {

                ALOGE("%s: unexpected stream state: %s (expected PAUSED)",

                        __func__, toString(reply.state).c_str());

                return INVALID_OPERATION;
@@ -209,6 +213,7 @@ status_t StreamHalAidl::standby() { 
            FALLTHROUGH_INTENDED;

        case StreamDescriptor::State::PAUSED:

        case StreamDescriptor::State::DRAIN_PAUSED:

        case StreamDescriptor::State::TRANSFER_PAUSED:

            if (mIsInput) return flush();

            RETURN_STATUS_IF_ERROR(flush(&reply));

            if (reply.state != StreamDescriptor::State::IDLE) {