From 14d226a2cd7b39e17a3f0bfdab79e645f7146f53 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 18 May 2015 13:53:39 -0700 Subject: [PATCH] Add comments to indicate code review was done for bugs Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db --- core/jni/android_media_AudioRecord.cpp | 1 + core/jni/android_media_AudioTrack.cpp | 1 + media/jni/soundpool/SoundPool.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 87b81d5fcad26..688e4db82fae2 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -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; } diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index daafd5e46148c..c673ce7fca78e 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -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; } diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 8038cdf322634..a705bcc374065 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -753,6 +753,7 @@ void SoundChannel::play(const sp& 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.