diff options
| author | Eric Laurent <elaurent@google.com> | 2016-06-07 18:00:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-07 18:00:28 +0000 |
| commit | 03c209b2a3544e3a8ca087bb28b99bd623f16098 (patch) | |
| tree | fcbe9901c67920bc755837e26ea15f6516d6f6ab | |
| parent | 7211131e238920db03c83f0c2c21f3c135a7e44f (diff) | |
| parent | 7b9f5be9149dc84cd16842757ee6fe04f3092dc1 (diff) | |
| download | base-03c209b2a3544e3a8ca087bb28b99bd623f16098.tar.gz | |
Merge "Delete Visualizer before lpJniStorage"
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 9 |
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 |