Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev

Browse Source 
* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
  SoundTrigger JNI: fix local reference leak.
This commit is contained in:
Eric Laurent
2014-10-31 00:13:30 +00:00
committed by Android Git Automerger
parent c2663dfdab 96c39e4c89
commit c27169e0d2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android_hardware_SoundTrigger.cpp
View File

@@ -265,18 +265,21 @@ void JNISoundTriggerCallback::onRecognitionEvent(struct sound_trigger_recognitio
event->capture_session, event->capture_delay_ms, event->capture_session, event->capture_delay_ms,
event->capture_preamble_ms, event->trigger_in_data, event->capture_preamble_ms, event->trigger_in_data,
jAudioFormat, jData, jExtras); jAudioFormat, jData, jExtras);
env->DeleteLocalRef(jAudioFormat); env->DeleteLocalRef(jExtras);
env->DeleteLocalRef(jData);
} else { } else {
jEvent = env->NewObject(gRecognitionEventClass, gRecognitionEventCstor, jEvent = env->NewObject(gRecognitionEventClass, gRecognitionEventCstor,
event->status, event->model, event->capture_available, event->status, event->model, event->capture_available,
event->capture_session, event->capture_delay_ms, event->capture_session, event->capture_delay_ms,
event->capture_preamble_ms, event->trigger_in_data, event->capture_preamble_ms, event->trigger_in_data,
jAudioFormat, jData); jAudioFormat, jData);
env->DeleteLocalRef(jAudioFormat);
env->DeleteLocalRef(jData);
} }
if (jAudioFormat != NULL) {
env->DeleteLocalRef(jAudioFormat);
}
if (jData != NULL) {
env->DeleteLocalRef(jData);
}
env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject, env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject,
SOUNDTRIGGER_EVENT_RECOGNITION, 0, 0, jEvent); SOUNDTRIGGER_EVENT_RECOGNITION, 0, 0, jEvent);