commit 5a07a62123d3e630d739e790528273c1c09e3490
author Eino-Ville Talvala <etalvala@google.com> Fri Sep 21 16:30:42 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Fri Sep 21 16:30:42 2012 -0700
tree ea7af5fbc562c9d2dd6993e280cb374b955ec90b
parent 45d76bb6c8f15335f89c287dbae04cc38f79d0a8

Camera2: Don't use ZSL when flash is on force fire mode.

Bug: 7213907
Change-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e

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;