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

Fix scope for visualizer object release

Browse Source 
am: 8dc9afa966

Change-Id: Ief46c52c14eddd947f8467d815af05c4ae538f72
This commit is contained in:
rago
2016-09-15 23:29:03 +00:00
committed by android-build-merger
parent 8f69452fc9 8dc9afa966
commit a80bdc38fa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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) {
sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0); { //limit scope so that lpVisualizer is deleted before JNI storage data.
if (lpVisualizer == 0) { sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0);
return; if (lpVisualizer == 0) {
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);