Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8e1206a authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "Delete Visualizer before lpJniStorage" am: 03c209b2

am: 913e2f83

* commit '913e2f83':
  Delete Visualizer before lpJniStorage

Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
parents e61d3ff3 913e2f83
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -435,10 +435,13 @@ setup_failure:

// ----------------------------------------------------------------------------
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);
        if (lpVisualizer == 0) {
            return;
        }
    }

    // delete the JNI data
    VisualizerJniStorage* lpJniStorage =