diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-30 16:25:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 16:25:14 +0000 |
| commit | 2e52f82440a2f0e78e23d3138e31cfdd4e239563 (patch) | |
| tree | 18acbf51386b909106b4dc9e38ec49ef54857a7b /media | |
| parent | 9d0b4d9eb6be89a03c3a93728157660c8445ca1b (diff) | |
| parent | 5054f906170f343312a299ec9e72aefb2ac24b7a (diff) | |
| download | frameworks_base-2e52f82440a2f0e78e23d3138e31cfdd4e239563.zip frameworks_base-2e52f82440a2f0e78e23d3138e31cfdd4e239563.tar.gz frameworks_base-2e52f82440a2f0e78e23d3138e31cfdd4e239563.tar.bz2 | |
am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '5054f906170f343312a299ec9e72aefb2ac24b7a':
media: set codec exception reason.
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 5f586a9..e34f9ed 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -592,8 +592,8 @@ static jthrowable createCodecException( break; } - // TODO: propagate reason from MediaCodec. - int reason = gExceptionReason.reasonHardware; + int reason = + (err == DEAD_OBJECT) ? gExceptionReason.reasonReclaimed : gExceptionReason.reasonHardware; return (jthrowable)env->NewObject(clazz.get(), ctor, err, actionCode, msgObj.get(), reason); } |