diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-21 18:34:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 18:34:43 -0700 |
| commit | e7fc0ece01c9672629664c07108640f589034636 (patch) | |
| tree | 0df0a8dbff16bda105f2a88833c0c15315ca1c43 /services/camera/libcameraservice | |
| parent | e8f1b2e454c4e462521d1751d515c1be4aa820e0 (diff) | |
| parent | 5a07a62123d3e630d739e790528273c1c09e3490 (diff) | |
| download | frameworks_av-e7fc0ece01c9672629664c07108640f589034636.zip frameworks_av-e7fc0ece01c9672629664c07108640f589034636.tar.gz frameworks_av-e7fc0ece01c9672629664c07108640f589034636.tar.bz2 | |
Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/camera2/CaptureSequencer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStart( 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; |