Merge "Visualizer: Fix deadlock on close"

2019-10-25 17:46:11 +00:00
parent f49633954b b2f11e6cc4
commit 52a3801810
1 changed files with 3 additions and 0 deletions
--- a/media/jni/audioeffect/Visualizer.cpp
+++ b/media/jni/audioeffect/Visualizer.cpp
@@ -78,10 +78,13 @@ status_t Visualizer::setEnabled(bool enabled)
    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();