From 96f2b555d2200fca7d8399c4c9a968590637aa31 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Wed, 30 Nov 2011 15:27:38 +0200 Subject: CameraHAL: Fix for CTS test #testFocusDistances - The 'focusStatus' variable in 'doAutoFocus()' is uninitialized in the case where the camera client sets focus lock in CAF mode. Depending on the current stack content this method might try to set CAF focus again and wait for a focus callback, which will inevitably timeout. - Fix for random fails during CTS test #testFocusDistances. Change-Id: Iafa84bbf5b7119d77f1f666a6a88c613b657541e Signed-off-by: Emilian Peev --- camera/OMXCameraAdapter/OMXFocus.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'camera') diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index 5703610..50e2c21 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp @@ -108,6 +108,8 @@ status_t OMXCameraAdapter::doAutoFocus() return NO_ERROR; } + OMX_INIT_STRUCT_PTR (&focusStatus, OMX_PARAM_FOCUSSTATUSTYPE); + // If the app calls autoFocus, the camera will stop sending face callbacks. pauseFaceDetection(true); -- cgit v1.1