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

Commit 1672f340 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev am: 2e73ff5e 

am: d65afab7

Change-Id: Iad6e749ec60ba6225634be3d4121c418c9ebfa55
parents da2432bb d65afab7

core/jni/android_media_AudioRecord.cpp

+9 −0
Original line number Diff line number Diff line
@@ -368,10 +368,19 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
    // of the Java object (in mNativeCallbackCookie) so we can free the memory in finalize()

    env->SetLongField(thiz, javaAudioRecordFields.nativeCallbackCookie, (jlong)lpCallbackData);



    if (paa != NULL) {

        // audio attributes were copied in AudioRecord creation

        free(paa);

        paa = NULL;

    }



    return (jint) AUDIO_JAVA_SUCCESS;



    // failure:

native_init_failure:

    if (paa != NULL) {

        free(paa);

    }

    env->DeleteGlobalRef(lpCallbackData->audioRecord_class);

    env->DeleteGlobalRef(lpCallbackData->audioRecord_ref);

    delete lpCallbackData;