diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-06-19 16:05:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 16:05:13 +0000 |
| commit | 969a06475c18a34fcd1cf181c290d3ef3d0673f7 (patch) | |
| tree | b4162d13eb55c174672fff3558ce78a49e98a5b8 /media/jni | |
| parent | 1247e48e0262ea9ac807bbd0e0939dc0450cd6ab (diff) | |
| parent | 314b7f3af3b253593f45778ba67a519e74829aa4 (diff) | |
| download | frameworks_base-969a06475c18a34fcd1cf181c290d3ef3d0673f7.zip frameworks_base-969a06475c18a34fcd1cf181c290d3ef3d0673f7.tar.gz frameworks_base-969a06475c18a34fcd1cf181c290d3ef3d0673f7.tar.bz2 | |
Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index d456dc1..9ec0312 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -308,6 +308,10 @@ static bool throwExceptionAsNecessary( } else if (err == ERROR_DRM_DEVICE_REVOKED) { jniThrowException(env, "android/media/DeniedByServerException", msg); return true; + } else if (err == DEAD_OBJECT) { + jniThrowException(env, "android/media/MediaDrmResetException", + "mediaserver died"); + return true; } else if (err != OK) { String8 errbuf; if (drmMessage != NULL) { |