Don't CHECK on illegal state change

Bug: 36075139 Change-Id: If399c1cb83a6cf79f0e52353dce9d8142e7728c6
7 years ago · f75a2aebde
parent 69545369ee
commit f75a2aebde
1 changed files with 6 additions and 1 deletions
--- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
+++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@ -454,7 +454,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: