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

Merge "MediaCryptoException: human readable error codes" into sc-dev am: f5e313dc1f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13639134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a34cb77085d1135cefeb29c81eb83cde0e52985
This commit is contained in:
Robert Shih
2021-02-24 07:00:42 +00:00
committed by Automerger Merge Worker
parent 026939d12c f5e313dc1f
commit e7ff0d76ea
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/jni/android_media_MediaCrypto.cpp
View File

@@ -202,10 +202,11 @@ static void android_media_MediaCrypto_native_setup(
uuid = NULL; uuid = NULL;
if (err != OK) { if (err != OK) {
jniThrowException( std::string strerr(StrCryptoError(err));
jniThrowExceptionFmt(
env, env,
"android/media/MediaCryptoException", "android/media/MediaCryptoException",
"Failed to instantiate crypto object."); "Failed to instantiate crypto object: %s", strerr.c_str());
return; return;
} }
@@ -295,7 +296,8 @@ static void android_media_MediaCrypto_setMediaDrmSession(
} else if (err == NO_INIT) { } else if (err == NO_INIT) {
msg += ": crypto plugin not initialized"; msg += ": crypto plugin not initialized";
} else { } else {
msg.appendFormat(": general failure (%d)", err); std::string strerr(StrCryptoError(err));
msg.appendFormat(": general failure (%s)", strerr.c_str());
} }
jniThrowException(env, "android/media/MediaCryptoException", msg.string()); jniThrowException(env, "android/media/MediaCryptoException", msg.string());
} }