commit 7ba86e214ac55326c7d190acfe4bd253b69e0b54
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 17 00:04:32 2017 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 17 00:04:32 2017 +0000
tree 7949b8970081c77f933d784980c35ef01c40e810
parent 2c267a63af1e1b8a779dc083462cde75e8003f1b
parent 7e2f63976e1f3edd9ffa2adfe98d9911c42fc987

Snap for 4455664 from 7e2f63976e1f3edd9ffa2adfe98d9911c42fc987 to oreo-vts-release

Change-Id: I80c63a90322ba408d78efb611a2883f24f889bc7

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 58472c0..f1311f2 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,7 +1892,6 @@
                 newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS;
             } else {
                 ALOGE("%s: Error, Unknown stream type", __func__);
-                pthread_mutex_unlock(&mMutex);
                 return -EINVAL;
             }
 
@@ -3702,7 +3701,6 @@
             if(ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters,
                 CAM_INTF_META_FRAME_NUMBER, request->frame_number)) {
                 ALOGE("%s: Failed to set the frame number in the parameters", __func__);
-                pthread_mutex_unlock(&mMutex);
                 return BAD_VALUE;
             }
         }