commit e7fc0ece01c9672629664c07108640f589034636
author Eino-Ville Talvala <etalvala@google.com> Fri Sep 21 18:34:43 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 21 18:34:43 2012 -0700
tree 0df0a8dbff16bda105f2a88833c0c15315ca1c43
parent e8f1b2e454c4e462521d1751d515c1be4aa820e0
parent 5a07a62123d3e630d739e790528273c1c09e3490

Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
index a836321..bdd8fa9 100644
--- a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
+++ b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
@@ -263,7 +263,8 @@
         nextState = BURST_CAPTURE_START;
     }
     else if (l.mParameters.zslMode &&
-            l.mParameters.state == Parameters::STILL_CAPTURE) {
+            l.mParameters.state == Parameters::STILL_CAPTURE &&
+            l.mParameters.flashMode != Parameters::FLASH_MODE_ON) {
         nextState = ZSL_START;
     } else {
         nextState = STANDARD_START;