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

Merge "MediaDrm: detailed Exception messages continued" into sc-dev

Browse Source
This commit is contained in:
Robert Shih
2021-03-04 04:08:27 +00:00
committed by Android (Google) Code Review
parent 0c7463b8d7 250f6a7425
commit 35dd3d135f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/jni/android_media_MediaDrm.cpp
View File

@@ -445,8 +445,7 @@ static bool throwExceptionAsNecessary(
jniThrowException(env, "android/media/DeniedByServerException", msg);
return true;
} else if (err == DEAD_OBJECT) {
jniThrowException(env, "android/media/MediaDrmResetException",
"mediaserver died");
jniThrowException(env, "android/media/MediaDrmResetException", msg);
return true;
} else if (isSessionException(err)) {
throwSessionException(env, msg, err);
@@ -967,10 +966,12 @@ static void android_media_MediaDrm_native_setup(
status_t err = drm->initCheck();
if (err != OK) {
auto logs(DrmUtils::gLogBuf.getLogs());
auto msg(DrmUtils::GetExceptionMessage(err, "Failed to instantiate drm object", logs));
jniThrowException(
env,
"android/media/UnsupportedSchemeException",
"Failed to instantiate drm object.");
msg.c_str());
return;
}