Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev

Browse Source
This commit is contained in:
Jeff Tinker
2015-06-03 20:03:28 +00:00
committed by Android (Google) Code Review
parent c52e0d900c 025af8b0de
commit 4575acf1e7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/jni/android_media_MediaCrypto.cpp
View File

@@ -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[] = {