Merge "MediaCryptoException: human readable error codes" into sc-dev (f5e313dc) · Commits · e / os / android_frameworks_base

media/jni/android_media_MediaCrypto.cpp

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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());
	}		}