diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-28 02:18:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 02:18:10 +0000 |
| commit | 7a99fbbc89f3b6342243a60864b449d2212dfa86 (patch) | |
| tree | 324b13c06ec1065f60798995c942363c1ce2333b /camera | |
| parent | 2124cbffb3ba8f4b0dd5c444271b7ce1c04c5f03 (diff) | |
| parent | 6a2252f8068c876dc81a5da706fc365183a5c159 (diff) | |
| download | omap4xxx-7a99fbbc89f3b6342243a60864b449d2212dfa86.tar.gz | |
am 6a2252f8: am 030e1a59: CameraHal: Check state in doAutoFocus
* commit '6a2252f8068c876dc81a5da706fc365183a5c159':
CameraHal: Check state in doAutoFocus
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXFocus.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index 9daea44..102daeb 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp @@ -105,6 +105,11 @@ status_t OMXCameraAdapter::doAutoFocus() return NO_INIT; } + if( ((AF_ACTIVE & getState()) != AF_ACTIVE) && ((AF_ACTIVE & getNextState()) != AF_ACTIVE) ) { + CAMHAL_LOGDA("Auto focus got canceled before doAutoFocus could be called"); + return NO_ERROR; + } + // If the app calls autoFocus, the camera will stop sending face callbacks. pauseFaceDetection(true); |