diff options
| author | Sundar Raman <sunds@ti.com> | 2011-08-24 23:02:03 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-25 16:38:37 -0700 |
| commit | b93aec67a3f7a66060a525a5c0d68fa0089f76c4 (patch) | |
| tree | 162c2021dffc1ad6cfb4eca1318b6637fb40f411 /camera | |
| parent | f5094850dd99854af026e16bd21d8555a5168afb (diff) | |
| download | omap4-aah-b93aec67a3f7a66060a525a5c0d68fa0089f76c4.tar.gz | |
CameraHAL: Fixes related to CTS test #testFocusAreas
- The recording hint implementation was bypassing
the logic for restoring the original correct
CameraParameters, which is needed for passing the
test.
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Change-Id: I8c119153dfedab5511955bff1d4c1193014ed720
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraHal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index f0421cb..5f1a8a4 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -252,7 +252,7 @@ int CameraHal::setParameters(const CameraParameters& params) status_t ret = NO_ERROR; // Needed for KEY_RECORDING_HINT bool restartPreviewRequired = false; - CameraParameters oldParams = mParameters; + CameraParameters oldParams(mParameters.flatten()); { Mutex::Autolock lock(mLock); @@ -913,6 +913,11 @@ int CameraHal::setParameters(const CameraParameters& params) } + //On fail restore old parameters + if ( NO_ERROR != ret ) { + mParameters.unflatten(oldParams.flatten()); + } + // Restart Preview if needed by KEY_RECODING_HINT only if preview is already running. // If preview is not started yet, Video Mode parameters will take effect on next startPreview() if(restartPreviewRequired && previewEnabled()) @@ -926,11 +931,6 @@ int CameraHal::setParameters(const CameraParameters& params) return ret; } - //On fail restore old parameters - if ( NO_ERROR != ret ) { - mParameters = oldParams; - } - LOG_FUNCTION_NAME_EXIT; return ret; |