commit 6caa0c805ef028707af71cb84b6ab11aee67abb5
author Sungjoong Kang <sj3.kang@samsung.com> Thu Oct 04 18:19:14 2012 -0700
committer Alex Ray <aray@google.com> Fri Oct 05 14:52:00 2012 -0700
tree b5caf5859e3e7efbdeba8fd898c533e986d5c7d4
parent 87423e5686296b1938959ff8bf9817490ddee2f1

hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

This bug fixes AF failure on changing to AF from CAF mode.

BUG: 7287500
Change-Id: Idae0d247787ad3bb7dfe68e4f1d16f39cfb68fbd
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 1f70ef4..14bca2a 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -4804,6 +4804,8 @@
 
     switch (m_afState) {
     case HAL_AFSTATE_INACTIVE:
+    case HAL_AFSTATE_PASSIVE_FOCUSED:
+    case HAL_AFSTATE_SCANNING:
         nextState = HAL_AFSTATE_NEEDS_COMMAND;
         m_IsAfTriggerRequired = true;
         m_ctlInfo.af.m_afTriggerTimeOut = 4;
@@ -4814,9 +4816,6 @@
     case HAL_AFSTATE_STARTED:
         nextState = NO_TRANSITION;
         break;
-    case HAL_AFSTATE_SCANNING:
-        nextState = NO_TRANSITION;
-        break;
     case HAL_AFSTATE_LOCKED:
         nextState = HAL_AFSTATE_NEEDS_COMMAND;
         m_IsAfTriggerRequired = true;