diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-30 15:58:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 15:58:22 +0000 |
| commit | c98070a46168c14e54899bfca69889154e3a565d (patch) | |
| tree | 4b73f9d8d7f0c3ebcd6fe29249351ba8f9878dfc /media | |
| parent | d0363bc3948894cc79f32719e04d66496572fe31 (diff) | |
| parent | 1b12db9e6225171da87ed9586daeabf76b53c05a (diff) | |
| download | frameworks_base-c98070a46168c14e54899bfca69889154e3a565d.zip frameworks_base-c98070a46168c14e54899bfca69889154e3a565d.tar.gz frameworks_base-c98070a46168c14e54899bfca69889154e3a565d.tar.bz2 | |
am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '1b12db9e6225171da87ed9586daeabf76b53c05a':
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); } |