Merge "Camera: Avoid possible deadlock during R&C updates" into tm-dev
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index a6a89af..c2f8488 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -1689,12 +1689,15 @@
__FUNCTION__, mCameraId, degrees);
return BAD_VALUE;
}
- SharedParameters::Lock l(mParameters);
- if (mRotateAndCropMode != ANDROID_SCALER_ROTATE_AND_CROP_NONE) {
- ALOGI("%s: Rotate and crop set to: %d, skipping display orientation!", __FUNCTION__,
- mRotateAndCropMode);
- transform = mRotateAndCropPreviewTransform;
+ {
+ Mutex::Autolock icl(mRotateAndCropLock);
+ if (mRotateAndCropMode != ANDROID_SCALER_ROTATE_AND_CROP_NONE) {
+ ALOGI("%s: Rotate and crop set to: %d, skipping display orientation!", __FUNCTION__,
+ mRotateAndCropMode);
+ transform = mRotateAndCropPreviewTransform;
+ }
}
+ SharedParameters::Lock l(mParameters);
if (transform != l.mParameters.previewTransform &&
getPreviewStreamId() != NO_STREAM) {
mDevice->setStreamTransform(getPreviewStreamId(), transform);
@@ -2317,7 +2320,7 @@
if (rotateAndCrop > ANDROID_SCALER_ROTATE_AND_CROP_AUTO) return BAD_VALUE;
{
- Mutex::Autolock icl(mBinderSerializationLock);
+ Mutex::Autolock icl(mRotateAndCropLock);
if (mRotateAndCropIsSupported) {
mRotateAndCropMode = rotateAndCrop;
} else {
diff --git a/services/camera/libcameraservice/api1/Camera2Client.h b/services/camera/libcameraservice/api1/Camera2Client.h
index 58e0e19..c8dfc46 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.h
+++ b/services/camera/libcameraservice/api1/Camera2Client.h
@@ -240,6 +240,8 @@
bool isZslEnabledInStillTemplate();
// The current rotate & crop mode passed by camera service
uint8_t mRotateAndCropMode;
+ // Synchronize access to 'mRotateAndCropMode'
+ mutable Mutex mRotateAndCropLock;
// Contains the preview stream transformation that would normally be applied
// when the display rotation is 0
int mRotateAndCropPreviewTransform;