diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-06-01 14:17:06 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2015-06-01 14:17:06 -0700 |
| commit | 025af8b0de1c4697a54f6b7363e27111a00eb284 (patch) | |
| tree | ef4ac111de2db296cc8816df83a67a17d3d7b628 /media/jni | |
| parent | 80ce4ad644af507b20eeac3d2ecf937ef4abd2de (diff) | |
| download | frameworks_base-025af8b0de1c4697a54f6b7363e27111a00eb284.zip frameworks_base-025af8b0de1c4697a54f6b7363e27111a00eb284.tar.gz frameworks_base-025af8b0de1c4697a54f6b7363e27111a00eb284.tar.bz2 | |
Fix bug in MediaCrypto.setMediaDrmSession
MediaCryptoException was being thrown unexpectedly
bug: 21565802
Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaCrypto.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index a9accb0..d7968d2 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -301,17 +301,19 @@ static void android_media_MediaCrypto_setMediaDrmSession( status_t err = crypto->setMediaDrmSession(sessionId); - String8 msg("setMediaDrmSession failed"); - if (err == ERROR_DRM_SESSION_NOT_OPENED) { - msg += ": session not opened"; - } else if (err == ERROR_UNSUPPORTED) { - msg += ": not supported by this crypto scheme"; - } else if (err == NO_INIT) { - msg += ": crypto plugin not initialized"; - } else if (err != OK) { - msg.appendFormat(": general failure (%d)", err); + if (err != OK) { + String8 msg("setMediaDrmSession failed"); + if (err == ERROR_DRM_SESSION_NOT_OPENED) { + msg += ": session not opened"; + } else if (err == ERROR_UNSUPPORTED) { + msg += ": not supported by this crypto scheme"; + } else if (err == NO_INIT) { + msg += ": crypto plugin not initialized"; + } else { + msg.appendFormat(": general failure (%d)", err); + } + jniThrowException(env, "android/media/MediaCryptoException", msg.string()); } - jniThrowException(env, "android/media/MediaCryptoException", msg.string()); } static JNINativeMethod gMethods[] = { |