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

Commit b5a56bd5 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Don't CHECK on illegal state change" 

am: 6112189b

Change-Id: Ie0a119334e2f67e35a58f9e2b685fa3fa7038639
parents f64fa712 6112189b

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+6 −1
Original line number Diff line number Diff line
@@ -459,7 +459,12 @@ void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) { 
        state = OMX_StateLoaded;

    }



    CHECK_EQ((int)mState, (int)mTargetState);

    if (mState != mTargetState) {

        ALOGE("State change to state %d requested while still transitioning from state %d to %d",

                state, mState, mTargetState);

        notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

        return;

    }



    switch (mState) {

        case OMX_StateLoaded: