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

Commit e7e84f95 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 9d0441fb d974cf81

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) {