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

Merge "Delete Visualizer before lpJniStorage"

Browse Source 
am: 03c209b2a3

* commit '03c209b2a3544e3a8ca087bb28b99bd623f16098':
  Delete Visualizer before lpJniStorage

Change-Id: Id685a9b6a4735bd2ef34a9d10fba50e37844dc19
This commit is contained in:
ganxiaolin
2016-06-07 18:07:25 +00:00
committed by android-build-merger
parent b9d266ff9b 03c209b2a3
commit 913e2f83b2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,10 +435,13 @@ setup_failure:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) { static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) {
// ensure that lpVisualizer is deleted before lpJniStorage
{
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 =