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

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

Merge "libaudiohal@aidl: Allow onError callback in any state" into main am:... 

Merge "libaudiohal@aidl: Allow onError callback in any state" into main am: e7b43745 am: cbcca296

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



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

media/libaudiohal/impl/StreamHalAidl.cpp

+2 −9
Original line number Diff line number Diff line
@@ -460,15 +460,8 @@ void StreamHalAidl::onAsyncDrainReady() { 


void StreamHalAidl::onAsyncError() {

    std::lock_guard l(mLock);

    if (mLastReply.state == StreamDescriptor::State::IDLE ||

        mLastReply.state == StreamDescriptor::State::DRAINING ||

        mLastReply.state == StreamDescriptor::State::TRANSFERRING) {

    ALOGW("%s: received in the state %s", __func__, toString(mLastReply.state).c_str());

    mLastReply.state = StreamDescriptor::State::ERROR;

        ALOGW("%s: onError received", __func__);

    } else {

        ALOGW("%s: unexpected onError in the state %s", __func__,

                toString(mLastReply.state).c_str());

    }

}



status_t StreamHalAidl::createMmapBuffer(int32_t minSizeFrames __unused,