From bd5fdaa0a4b824d6d61c18bcd907abd1801a295b Mon Sep 17 00:00:00 2001
From: Ray Essick <essick@google.com>
Date: Thu, 10 Aug 2023 21:04:18 -0500
Subject: [PATCH] Better diagnostic for native createCodecByName()

when passing null, provide a useful diagnostic as part of
the nullpointerexception.

Bug: 295199911
Test: atest android.mediav2.cts.CodecUnitTest
Change-Id: Ib044f4e0e0cf812ec5d08d914ae59691fea2cbff
---
 media/jni/android_media_MediaCodec.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 53c02663636a2..44a0baa5faa73 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;
     }