commit b2f11e6cc4385d780b5dc1d5e840e640f82cae2b
author Aniket Kumar Lata <alata@quicinc.com> Wed Jul 03 10:44:47 2019 -0700
committer Marco Nelissen <marcone@google.com> Fri Oct 25 08:20:56 2019 -0700
tree 63e378f2a56938ff610f71cdd579383575ecdc7c
parent 70694b005db2fdd1a9fcd752b24fb25e60b8a632

Visualizer: Fix deadlock on close

Visualizer gets stuck in mCaptureThread::requestExitAndWait due to a
deadlock between mCaptureThread::mRunning and mCaptureLock.

Temporarily release mCaptureLock upon mCaptureThread::requestExitAndWait.

Test: Clarity -> Response, rapidly toggle visualizer enable, disable
Bug: 135326776
authored-by: Weiyin Jiang <wjiang@codeaurora.org>
Change-Id: If32431c4d7b271b7ea61168cb1a5a42f3a1cd66e

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();