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

Browse Source
This commit is contained in:
Robert Shih
2021-02-24 06:04:35 +00:00
committed by Android (Google) Code Review
parent 359919c32d 4b2c641d02
commit f5e313dc1f
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;
if (err != OK) {
jniThrowException(
std::string strerr(StrCryptoError(err));
jniThrowExceptionFmt(
env,
"android/media/MediaCryptoException",
"Failed to instantiate crypto object.");
"Failed to instantiate crypto object: %s", strerr.c_str());
return;
}
@@ -295,7 +296,8 @@ static void android_media_MediaCrypto_setMediaDrmSession(
} else if (err == NO_INIT) {
msg += ": crypto plugin not initialized";
} 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());
}