Merge "Delete Visualizer before lpJniStorage"

2016-06-07 18:00:28 +00:00
parent 7211131e23 7b9f5be914
commit 03c209b2a3
1 changed files with 6 additions and 3 deletions
--- 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