Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c649936b authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Better diagnostic for native createCodecByName()" into main am:... 

Merge "Better diagnostic for native createCodecByName()" into main am: e585f6b6 am: e037a0f4 am: 2395fbe2 am: 526e8dc0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704209



Change-Id: I95a9d90d071a4f78f157fe3b0ab833faea1f0551
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7becff2 526e8dc0

media/jni/android_media_MediaCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3450,7 +3450,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;

    }