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

Commit 16144ac3 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add comments to indicate code review was done for bugs" into mnc-dev

parents d198c60c 14d226a2

core/jni/android_media_AudioRecord.cpp

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ native_init_failure: 
    delete lpCallbackData;

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



    // lpRecorder goes out of scope, so reference count drops to zero

    return (jint) AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED;

}

core/jni/android_media_AudioTrack.cpp

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ native_init_failure: 
    delete lpJniStorage;

    env->SetLongField(thiz, javaAudioTrackFields.jniData, 0);



    // lpTrack goes out of scope, so reference count drops to zero

    return (jint) AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED;

}

media/jni/soundpool/SoundPool.cpp

+1 −0
Original line number Diff line number Diff line
@@ -753,6 +753,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV 
            status = newTrack->initCheck();

            if (status != NO_ERROR) {

                ALOGE("Error creating AudioTrack");

                // newTrack goes out of scope, so reference count drops to zero

                goto exit;

            }

            // From now on, AudioTrack callbacks received with previous toggle value will be ignored.