From 07dcac87c30dc8730cfd7a4312dce6de539e2cff Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Mon, 8 Sep 2014 23:48:46 +0200
Subject: camera: don't start AF again in VIDEO_AF_STATE

Change-Id: I148ab5bd10276b6a9e4ce852435a731e1e500554
---
 camera/CameraHal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'camera')

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;
-- 
cgit v1.1