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

Commit 82594bed authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2 

Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp

* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
parents 37648c87 5bb42b78

media/libstagefright/omx/OMXNodeInstance.cpp

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ status_t OMXNodeInstance::freeNode() { 
        }



        case OMX_StateLoaded:

        case OMX_StateInvalid:

            break;



        default: