commit 0f34491aeddfc41f06968c2a4c756e26096257e3
author Sungjoong Kang <sj3.kang@samsung.com> Fri Oct 05 16:43:41 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 05 16:43:41 2012 -0700
tree c3fae1eee072bfc05632591b88bf35be963d0919
parent 0e4735517a8eb8b40bef3f660b75979f73662d3c
parent 8deec2b90f8e09564f785d1e1a3ab0307b62eb10

am 8deec2b9: am 6caa0c80: hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

* commit '8deec2b90f8e09564f785d1e1a3ab0307b62eb10':
  hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 26e85e1..72a3746 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -4812,6 +4812,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;
@@ -4822,9 +4824,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;