summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 01:03:11 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 01:03:11 +0000
commit2c267a63af1e1b8a779dc083462cde75e8003f1b (patch)
tree2e97915485da221018d261cacdbcb2821529733e
parent163391e95a711076a23db36719ae896290aef9d5 (diff)
parentf137d40cd705482ff5a137f4daedd81dfed32388 (diff)
downloadbullhead-2c267a63af1e1b8a779dc083462cde75e8003f1b.tar.gz
release-request-3b3b081a-7be4-4fba-aa16-69532315cf6b-for-git_oc-vts-release-4269450 snap-temp-L40700000092488677android-vts-8.0_r2
Change-Id: Iaa6ce402a61abbf6206ea2b0137c8aa391714a45
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index f1311f2..58472c0 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,6 +1892,7 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked(
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 @@ no_error:
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;
}
}