diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-28 10:57:57 -0700 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-04-28 10:57:57 -0700 |
| commit | fb621e8737392ef10acbba083b46aedf6583c9a4 (patch) | |
| tree | e846c9182fe7633af535311d1a4ae43e7d94a0c0 /media | |
| parent | e658285baf86a223ad369851d1fc5ebacad7b408 (diff) | |
| download | frameworks_base-fb621e8737392ef10acbba083b46aedf6583c9a4.zip frameworks_base-fb621e8737392ef10acbba083b46aedf6583c9a4.tar.gz frameworks_base-fb621e8737392ef10acbba083b46aedf6583c9a4.tar.bz2 | |
media: set codec exception reason.
Bug: 19620911
Change-Id: I13c007bc82b367680e9a15dc6caed6ef8a81d0a6
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); } |