summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorMichael Gernoth <michael@gernoth.net>2014-09-08 23:48:46 +0200
committerHashcode <hashcode0f@gmail.com>2015-02-03 14:07:12 -0800
commit07dcac87c30dc8730cfd7a4312dce6de539e2cff (patch)
tree7fdcb020ffe5390100bc4e21217fc94db4cb0379 /camera
parent760a2b928f0c208cb2db5044936b038bd52701ac (diff)
downloadhardware_ti_omap4-07dcac87c30dc8730cfd7a4312dce6de539e2cff.zip
hardware_ti_omap4-07dcac87c30dc8730cfd7a4312dce6de539e2cff.tar.gz
hardware_ti_omap4-07dcac87c30dc8730cfd7a4312dce6de539e2cff.tar.bz2
camera: don't start AF again in VIDEO_AF_STATE
Change-Id: I148ab5bd10276b6a9e4ce852435a731e1e500554
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraHal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index ba8777f..e56bdf1 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -2984,7 +2984,7 @@ status_t CameraHal::autoFocus()
goto EXIT;
}
- if (state == CameraAdapter::AF_STATE)
+ if ((state == CameraAdapter::AF_STATE) || (state == CameraAdapter::VIDEO_AF_STATE))
{
CAMHAL_LOGI("Ignoring start-AF (already in progress)");
goto EXIT;