summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/jni/audioeffect/android_media_Visualizer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp
index ce886eeb5f93..4632f4a9e5b6 100644
--- a/media/jni/audioeffect/android_media_Visualizer.cpp
+++ b/media/jni/audioeffect/android_media_Visualizer.cpp
@@ -435,9 +435,12 @@ setup_failure:
// ----------------------------------------------------------------------------
static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) {
- sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0);
- if (lpVisualizer == 0) {
- return;
+ // ensure that lpVisualizer is deleted before lpJniStorage
+ {
+ sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0);
+ if (lpVisualizer == 0) {
+ return;
+ }
}
// delete the JNI data