commit c0934d128019e73434feff8728122a24af751dcf
author Younghwan Joo <yhwan.joo@samsung.com> Tue Oct 23 16:25:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 23 16:25:18 2012 -0700
tree 6773b38aa5daf652be467b814ceff4a12d62f099
parent 36e18f3cf14c54704d591e9add3e5d59e73ea9c2
parent dc3932a6f257c1ed958cd9262eff41293c900096

am dc3932a6: am a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

* commit 'dc3932a6f257c1ed958cd9262eff41293c900096':
  hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 7632753..189c647 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -668,6 +668,8 @@
     if (request_shot->shot.ctl.aa.aeMode >= AA_AEMODE_ON) {
         if (request_shot->shot.ctl.aa.captureIntent == AA_CAPTURE_INTENT_PREVIEW)
             ctl_info->flash.i_flashMode = request_shot->shot.ctl.aa.aeMode;
+        else if (request_shot->shot.ctl.aa.captureIntent == AA_CAPTURE_INTENT_VIDEO_RECORD)
+            ctl_info->flash.i_flashMode = request_shot->shot.ctl.aa.aeMode;
         request_shot->shot.ctl.aa.aeMode = AA_AEMODE_ON;
     }