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

Merge "Delete Visualizer before lpJniStorage" am: 03c209b2a3

Browse Source 
am: 913e2f83b2

* commit '913e2f83b223486ac1461dab86758848f9ad08e1':
  Delete Visualizer before lpJniStorage

Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
This commit is contained in:
Eric Laurent
2016-06-07 18:13:09 +00:00
committed by android-build-merger
parent e61d3ff3d1 913e2f83b2
commit c8e1206ad5
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 =