summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ray Essick <essick@google.com> 2023-08-11 16:49:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-11 16:49:02 +0000
commite037a0f4ac7b5010a87c96fa068c0a1c3ad3e877 (patch)
tree2b0a6294be64b8b1d91876e92c5c573b84132e77
parent390db5a6d8b0bfa1c2a14d6258f94904c5c8627e (diff)
parente585f6b611f48821f168b019c137991de9f9ab8c (diff)
Merge "Better diagnostic for native createCodecByName()" into main am: e585f6b611
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704209 Change-Id: I6348b77d647cb62f4f07cfe1031cf51f96022c35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/jni/android_media_MediaCodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 53c02663636a..44a0baa5faa7 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -3320,7 +3320,8 @@ static void android_media_MediaCodec_native_setup(
JNIEnv *env, jobject thiz,
jstring name, jboolean nameIsType, jboolean encoder, int pid, int uid) {
if (name == NULL) {
- jniThrowException(env, "java/lang/NullPointerException", NULL);
+ jniThrowException(env, "java/lang/NullPointerException",
+ "No codec name specified");
return;
}