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

Merge "Fix scope for visualizer object release" into nyc-mr1-dev

Browse Source
This commit is contained in:
Ricardo Garcia
2016-09-15 23:22:21 +00:00
committed by Android (Google) Code Review
parent eeb90153c1 8dc9afa966
commit d5a6febfc4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/jni/audioeffect/android_media_Visualizer.cpp
View File

@@ -435,11 +435,12 @@ setup_failure:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) { static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) {
{ //limit scope so that lpVisualizer is deleted before JNI storage data.
sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0); sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0);
if (lpVisualizer == 0) { if (lpVisualizer == 0) {
return; return;
} }
}
// delete the JNI data // delete the JNI data
VisualizerJniStorage* lpJniStorage = VisualizerJniStorage* lpJniStorage =
(VisualizerJniStorage *)env->GetLongField(thiz, fields.fidJniData); (VisualizerJniStorage *)env->GetLongField(thiz, fields.fidJniData);