diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 00:05:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 00:05:05 +0000 |
| commit | 545828756a91b99ea88aa00ac7fdd807ba6a7451 (patch) | |
| tree | 2e97915485da221018d261cacdbcb2821529733e | |
| parent | 7e2f63976e1f3edd9ffa2adfe98d9911c42fc987 (diff) | |
| parent | ddb04b81864e5147dbfbb92f0f30f78057a1fb98 (diff) | |
| download | bullhead-oreo-r4-release.tar.gz | |
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-releaseandroid-8.0.0_r35android-8.0.0_r16oreo-r4-release
Change-Id: Ic2db52ac1d7deac4cf5c2c339a7aa099e66b2a7f
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 2 |
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; } } |