summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-20 21:36:41 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-20 21:36:41 +0000
commit9555090309d7d57fca8e3acf61d2632e27cbc509 (patch)
tree2e97915485da221018d261cacdbcb2821529733e
parent4aa5f0749f63ccff7916fd26c874972afd15679e (diff)
parent545828756a91b99ea88aa00ac7fdd807ba6a7451 (diff)
downloadbullhead-oreo-r6-release.tar.gz
Snap for 4381952 from 545828756a91b99ea88aa00ac7fdd807ba6a7451 to oc-r6-releaseandroid-8.0.0_r32oreo-r6-release
Change-Id: I4b9b96626f25f38d021a2d6916db8caedc89b349
-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;
}
}