summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-15 19:22:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-15 19:22:09 +0000
commit19be00063202e122ac6246b6c54250b11ba49ee2 (patch)
treea3ac0d059738d47b7d9ecabc2873690de1e9d869
parent67b5be442eb7966f2e4fe249a13af55505ef947a (diff)
parentb17936d3b92eaad51df2eac594800b81d0985afb (diff)
downloadshamu-nougat-mr1.7-release.tar.gz
release-request-b6ec1e5a-8dd9-44a3-97f9-f374a706d9ac-for-git_nyc-mr1-security-g-release-4299435 snap-temp-L65100000103194273android-7.1.1_r57nougat-mr1.7-release
Change-Id: I9e3c054f0b8c809c4ac65fb08d113dfbd1e45964
-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 1a9079a2..08b57342 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1288,6 +1288,7 @@ int QCamera3HardwareInterface::configureStreams(
newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS;
} else {
ALOGE("%s: Error, Unknown stream type", __func__);
+ pthread_mutex_unlock(&mMutex);
return -EINVAL;
}
@@ -2347,6 +2348,7 @@ int QCamera3HardwareInterface::processCaptureRequest(
} else if (mFirstRequest || mCurrentRequestId == -1){
ALOGE("%s: Unable to find request id field, \
& no previous id available", __func__);
+ pthread_mutex_unlock(&mMutex);
return NAME_NOT_FOUND;
} else {
CDBG("%s: Re-using old request id", __func__);