Merge "Delete Visualizer before lpJniStorage" (03c209b2) · Commits · e / os / android_frameworks_base

media/jni/audioeffect/android_media_Visualizer.cpp

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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 =