commit fdbaf5d207ecca09ee1815dcb82b220d2b38ae53
author Younghwan Joo <yhwan.joo@samsung.com> Sat Sep 15 01:22:10 2012 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Mon Sep 17 15:54:56 2012 -0700
tree 7aecd0130150ccdcc1fb39bd867fd8a9dfaf4ff1
parent 70f7a6368f659ffa7b3da81a21c49cb18fd319a8

hardware: samsung_slsi: libcamera2: manual focus mode bug fix

This patch is to fix a bug that internal af canceling may be
duplicated with manual af

Change-Id: I492cc7a7292089808551067e3d68eee3e9daa566
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index cda8926..002585f 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -2932,7 +2932,7 @@
                 }
                 m_IsAfModeUpdateRequired = false;
                 // support inifinity focus mode
-                if ((m_afMode == AA_AFMODE_OFF) && ( shot_ext->shot.ctl.lens.focusDistance == 0)) {
+                if ((m_afMode == AA_AFMODE_MANUAL) && ( shot_ext->shot.ctl.lens.focusDistance == 0)) {
                     shot_ext->shot.ctl.aa.afMode = AA_AFMODE_INFINITY;
                     shot_ext->shot.ctl.aa.afTrigger = 1;
                     triggered = true;
@@ -3120,6 +3120,7 @@
                 memcpy(&m_jpegMetadata, &shot_ext->shot, sizeof(struct camera2_shot));
                 m_streamThreads[1]->SetSignal(SIGNAL_STREAM_REPROCESSING_START);
             }
+
             ALOGV("(%s): queued  aa(%d) aemode(%d) awb(%d) afmode(%d) trigger(%d)", __FUNCTION__,
             (int)(shot_ext->shot.ctl.aa.mode), (int)(shot_ext->shot.ctl.aa.aeMode),
             (int)(shot_ext->shot.ctl.aa.awbMode), (int)(shot_ext->shot.ctl.aa.afMode),
@@ -3161,6 +3162,7 @@
                 shot_ext->request_scp,
                 shot_ext->request_scc,
                 shot_ext->dis_bypass, sizeof(camera2_shot));
+
             ALOGV("(%s): DM aa(%d) aemode(%d) awb(%d) afmode(%d)", __FUNCTION__,
                 (int)(shot_ext->shot.dm.aa.mode), (int)(shot_ext->shot.dm.aa.aeMode),
                 (int)(shot_ext->shot.dm.aa.awbMode),