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

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

Merge "libaudiohal@aidl: Handle stream resume uniformly (2)" into main am:... 

Merge "libaudiohal@aidl: Handle stream resume uniformly (2)" into main am: 7d720a0e am: 777d9bb9

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



Change-Id: I8e427e1f467ade543777066052862040e3139599
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d92b459c 777d9bb9

media/libaudiohal/impl/StreamHalAidl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -383,10 +383,12 @@ status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) { 
                return INVALID_OPERATION;

            }

            return OK;

        } else if (state == StreamDescriptor::State::PAUSED) {

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

                   state == StreamDescriptor::State::TRANSFER_PAUSED ||

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

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

        } else {

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

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

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

            return INVALID_OPERATION;

        }