diff options
Diffstat (limited to 'camera/CameraHal.cpp')
| -rw-r--r-- | camera/CameraHal.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index c99af92..3610559 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -339,10 +339,6 @@ int CameraHal::setParameters(const CameraParameters& params) } - //CTS requirement, we should be able to change the preview resolution - //while in paused display state - if ( !previewEnabled() || mDisplayPaused ) - { params.getPreviewSize(&w, &h); if (w == -1 && h == -1) { CAMHAL_LOGEA("Unable to get preview size"); @@ -393,7 +389,6 @@ int CameraHal::setParameters(const CameraParameters& params) } CAMHAL_LOGDB("PreviewResolution by App %d x %d", w, h); - } // Handle RECORDING_HINT to Set/Reset Video Mode Parameters valstr = params.get(CameraParameters::KEY_RECORDING_HINT); @@ -1738,7 +1733,7 @@ void CameraHal::stopPreview() { LOG_FUNCTION_NAME; - if(!previewEnabled() && !mDisplayPaused) + if( (!previewEnabled() && !mDisplayPaused) || mRecordingEnabled) { LOG_FUNCTION_NAME_EXIT; return; |