commit 52a3801810fb06e73d1be9874c892fefa6a1bdc2
author Marco Nelissen <marcone@google.com> Fri Oct 25 17:46:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 25 17:46:11 2019 +0000
tree a3b71138141d7b6f62adfc748e19d4b9b11970bd
parent f49633954b7c48edb1072b6d0b9f3353ec63550b
parent b2f11e6cc4385d780b5dc1d5e840e640f82cae2b

Merge "Visualizer: Fix deadlock on close"

media/jni/audioeffect/Visualizer.cpp

diff --git a/media/jni/audioeffect/Visualizer.cpp b/media/jni/audioeffect/Visualizer.cpp
index e48032a..83f3b6e 100644
--- a/media/jni/audioeffect/Visualizer.cpp
+++ b/media/jni/audioeffect/Visualizer.cpp
@@ -78,10 +78,13 @@
     if (t != 0) {
         if (enabled) {
             if (t->exitPending()) {
+                mCaptureLock.unlock();
                 if (t->requestExitAndWait() == WOULD_BLOCK) {
+                    mCaptureLock.lock();
                     ALOGE("Visualizer::enable() called from thread");
                     return INVALID_OPERATION;
                 }
+                mCaptureLock.lock();
             }
         }
         t->mLock.lock();