commit b092002c9425a1c2e4d91b656d8add354931e752
author android-build-team Robot <android-build-team-robot@google.com> Wed Aug 23 00:05:20 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Aug 23 00:05:20 2017 +0000
tree bf659e3a79da0f59f67084847dd1aebe3526bfea
parent 8ce4cb04b0b8d6ef537b55eaff813d4ff7840946
parent 1f29df6eec6cf5b062a9314c77407684a82f8fee

Merge cherrypicks of [2775117, 2775364, 2775365, 2775366, 2775118, 2775759, 2775760, 2775367, 2775368, 2775731, 2775732, 2775369, 2775370, 2775371, 2775372, 2775373, 2775374, 2775375, 2775540, 2775541, 2775819, 2775820, 2775747, 2775748] into oc-r4-release

Change-Id: I3c24b7151af661127598df86cc217221e19a3880

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index f94d211..5f9f974 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,6 +1892,7 @@
                 newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS;
             } else {
                 ALOGE("%s: Error, Unknown stream type", __func__);
+                pthread_mutex_unlock(&mMutex);
                 return -EINVAL;
             }
 
@@ -3701,6 +3702,7 @@
             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;
             }
         }