From 4b2c641d02b40225b13ca6584d7dbfa11415c4b1 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Sun, 14 Feb 2021 07:56:32 +0000 Subject: MediaCryptoException: human readable error codes Bug: 162255728 Change-Id: I912daa716a3018e787cccb7db9bf6fa293197c66 Test: build --- media/jni/android_media_MediaCrypto.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index 517672ee6127..f491be884b2f 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -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()); } -- cgit v1.2.3-59-g8ed1b