summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:33:34 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:33:34 +0000
commit021a345d402fb1aebbbcaf4ad62ce7ddd5cec3f3 (patch)
tree89feb8b6038481562361776639439e97d86bfc29
parenta477c9c6f7ba38b5cc45f350b1be9cfe7799c665 (diff)
parentab2deabe2e7684cc8f7b2ce9460e199e7d851b97 (diff)
downloadangler-021a345d402fb1aebbbcaf4ad62ce7ddd5cec3f3.tar.gz
release-request-68cc9b2a-98ae-4fbf-8b56-3e535855f399-for-git_oc-mr1-release-4269864 snap-temp-L25700000092502312
Change-Id: Ic4d07485830c99a7c46a04d42dc9f5ed6e74f0d3
-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 1893800..febd972 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;
}
}