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

Commit ddd12804 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 261a784c: Merge change 7720 into donut 

Merge commit '261a784c'

* commit '261a784c':
  Fix global ref leak in android.media.AudioRecord. Delete global refs
parents 568ebf06 261a784c

core/jni/android_media_AudioRecord.cpp

+5 −1
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
    

    // failure:

native_init_failure:

    env->DeleteGlobalRef(lpCallbackData->audioRecord_class);

    env->DeleteGlobalRef(lpCallbackData->audioRecord_ref);

    delete lpCallbackData;



native_track_failure:
@@ -274,6 +276,8 @@ static void android_media_AudioRecord_finalize(JNIEnv *env, jobject thiz) { 
        thiz, javaAudioRecordFields.nativeCallbackCookie);

    if (lpCookie) {

        LOGV("deleting lpCookie: %x\n", (int)lpCookie);

        env->DeleteGlobalRef(lpCookie->audioRecord_class);

        env->DeleteGlobalRef(lpCookie->audioRecord_ref);

        delete lpCookie;

    }