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

Commit d55cdb93 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libaudiohal@aidl: Allow onError callback in any state 

In practice, the AoC can crash while the stream is in
any state, thus this should be allowed for correct
handling of error conditions in the framework.

Bug: 339400414
Test: repro steps for simulating AoC crash in b/339400414
Change-Id: I4b561fcba7f5e36295bd90aa685e63430f46a1aa
parent 13ed9445

media/libaudiohal/impl/StreamHalAidl.cpp

+2 −9
Original line number Diff line number Diff line
@@ -456,15 +456,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,