summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorEmilian Peev <epeev@mm-sol.com>2012-03-21 18:19:08 +0200
committerWu-cheng Li <wuchengli@google.com>2012-03-23 15:03:40 +0800
commit484116750df56d0805d5f5727ad94701f916e8c6 (patch)
treee5439a38a6e0444cc2a29e67f2f299a5fcadc528 /camera
parent15f4f11659750ce36832f55fe6dd7aa145daa6dd (diff)
downloadhardware_ti_omap4xxx-484116750df56d0805d5f5727ad94701f916e8c6.zip
hardware_ti_omap4xxx-484116750df56d0805d5f5727ad94701f916e8c6.tar.gz
hardware_ti_omap4xxx-484116750df56d0805d5f5727ad94701f916e8c6.tar.bz2
CameraHal: Don't signal off AF status events to 'doAutoFocus()'
- In dark lighting conditions and when AF assist is active sometimes the OMX camera component changes the AF status to off and generates and OMX event. Currently this is being interpreted as cancel AF. Bug: 6197932 Change-Id: Ibddd0033eecd186c1bfc90530af651f1c0223a25 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/OMXCameraAdapter/OMXFocus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp
index fcc2010..e9a969c 100644
--- a/camera/OMXCameraAdapter/OMXFocus.cpp
+++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -804,7 +804,8 @@ void OMXCameraAdapter::handleFocusCallback() {
return;
}
- if (eFocusStatus.eFocusStatus != OMX_FocusStatusRequest) {
+ if ( ( eFocusStatus.eFocusStatus != OMX_FocusStatusRequest ) &&
+ ( eFocusStatus.eFocusStatus != OMX_FocusStatusOff ) ) {
// signal doAutoFocus when a end of scan message comes
// ignore start of scan
Mutex::Autolock lock(mDoAFMutex);