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.
This commit is contained in:
Andreas Huber
2009-11-06 11:35:57 -08:00
committed by Android Git Automerger

View File

@@ -149,6 +149,7 @@ status_t OMXNodeInstance::freeNode() {
}
case OMX_StateLoaded:
case OMX_StateInvalid:
break;
default: