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

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

Merge "libaudiohal@aidl: allow ACTIVE,TRANSFERRING,DRAINING for resume" into... 

Merge "libaudiohal@aidl: allow ACTIVE,TRANSFERRING,DRAINING for resume" into main am: 03d96f08 am: a233cdb0

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



Change-Id: Ic1bb3f02a240934e5a563d3e4f075c29b14cf18f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c7edfae a233cdb0

media/libaudiohal/impl/StreamHalAidl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -449,6 +449,11 @@ status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) { 
                   state == StreamDescriptor::State::TRANSFER_PAUSED ||

                   state == StreamDescriptor::State::DRAIN_PAUSED) {

            return sendCommand(makeHalCommand<HalCommand::Tag::start>(), reply);

        } else if (state == StreamDescriptor::State::ACTIVE ||

                   state == StreamDescriptor::State::TRANSFERRING ||

                   state == StreamDescriptor::State::DRAINING) {

            ALOGD("%s: already in stream state: %s", __func__, toString(state).c_str());

            return OK;

        } else {

            ALOGE("%s: unexpected stream state: %s (expected IDLE or one of *PAUSED states)",

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