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

Commit eafdc523 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 am: b5a56bd5 

am: 7cc75ac7

Change-Id: I1c8a1c5c8d46313a5deeefc366051a13b233343e
parents 1405a7e2 7cc75ac7

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+6 −1
Original line number Diff line number Diff line
@@ -458,7 +458,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: