commit 66036d50a8303cddfdd5c7320eea0eff48cb4a5e
author Zhijun He <zhijunhe@google.com> Tue Apr 22 20:39:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 22 20:39:38 2014 +0000
tree 825440bf8f4f1715d7e9ff75119c2b179cf06d07
parent 3ccf3c1e888821e88e82285380ca6c382c708e56
parent 7ef20390ba4375c4b08edd14923846086987a8c8

Merge "camera3: Don't hold mLock during flush call"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 729020b..c7abe3a 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1162,13 +1162,17 @@
     ATRACE_CALL();
     ALOGV("%s: Camera %d: Flushing all requests", __FUNCTION__, mId);
     Mutex::Autolock il(mInterfaceLock);
-    Mutex::Autolock l(mLock);
 
-    mRequestThread->clear(/*out*/frameNumber);
+    {
+        Mutex::Autolock l(mLock);
+        mRequestThread->clear(/*out*/frameNumber);
+    }
+
     status_t res;
     if (mHal3Device->common.version >= CAMERA_DEVICE_API_VERSION_3_1) {
         res = mHal3Device->ops->flush(mHal3Device);
     } else {
+        Mutex::Autolock l(mLock);
         res = waitUntilDrainedLocked();
     }