commit 5ae59b8c15ccb9a3244ed8209d3dbc2c28287ad7
author Moja Hsu <mojahsu@google.com> Wed Sep 08 16:32:30 2021 +0800
committer Commit Bot <commit-bot@chromium.org> Sat Sep 11 05:59:14 2021 +0000
tree 15c8e89459c46570eed93eb2c94c50ed41134a13
parent c33dd23e50377e6f9fa9f7cfed2a85af62fb8526

camera: check ZSL enabled before setting ZSL metadata

We always set ZSL metadata in capture templates even if the ZSL is not
enabled on that stream. This CL adds the zsl_enabled_ back.

BUG=b:198517989
TEST=Pass StillCaptureTest#testAeCompensation on kukui

Change-Id: I1d160d8409ce3a35a6f34a28d9354ea7ac3573d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3146936
Reviewed-by: Ricky Liang <jcliang@chromium.org>
Tested-by: Hsu Wei-Cheng <mojahsu@chromium.org>
Commit-Queue: Hsu Wei-Cheng <mojahsu@chromium.org>

camera/features/zsl/zsl_stream_manipulator.cc

diff --git a/camera/features/zsl/zsl_stream_manipulator.cc b/camera/features/zsl/zsl_stream_manipulator.cc
index 66980c8..19ab325 100644
--- a/camera/features/zsl/zsl_stream_manipulator.cc
+++ b/camera/features/zsl/zsl_stream_manipulator.cc
@@ -55,6 +55,9 @@
 
 bool ZslStreamManipulator::ConstructDefaultRequestSettings(
     android::CameraMetadata* default_request_settings, int type) {
+  if (!zsl_enabled_) {
+    return true;
+  }
   uint8_t zsl_enable = ANDROID_CONTROL_ENABLE_ZSL_TRUE;
   if (default_request_settings->update(ANDROID_CONTROL_ENABLE_ZSL, &zsl_enable,
                                        1) != 0) {