commit 1393a2838d5cebb468a85891abae9ac4b3262397
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 10 02:33:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 10 02:33:32 2019 +0000
tree 90746849c117a06e081c440bef45c02b2c653448
parent e8e1c69626f56db48219d174240de0a1550a93c3
parent 7a7e63456bcdba32ea41180d53fc9ecafba9c484

Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev

media/libmedia/Visualizer.cpp

diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp
index cb8d375..2bf0802 100644
--- a/media/libmedia/Visualizer.cpp
+++ b/media/libmedia/Visualizer.cpp
@@ -77,10 +77,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();