diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-05-28 14:52:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 14:52:37 +0000 |
| commit | 16144ac3789f6dbe36a7011cf23305f072a7bfcb (patch) | |
| tree | 28900ef1688621518becf9e0ed3a5dee6c33d754 /core/jni | |
| parent | d198c60c944a946f31e151b29dd919aac71e87eb (diff) | |
| parent | 14d226a2cd7b39e17a3f0bfdab79e645f7146f53 (diff) | |
| download | frameworks_base-16144ac3789f6dbe36a7011cf23305f072a7bfcb.zip frameworks_base-16144ac3789f6dbe36a7011cf23305f072a7bfcb.tar.gz frameworks_base-16144ac3789f6dbe36a7011cf23305f072a7bfcb.tar.bz2 | |
Merge "Add comments to indicate code review was done for bugs" into mnc-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 1 | ||||
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 5928c69..6c2bbd4 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 5b52a49..5faa150 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; } |