commit 5d1c6303df903b79c549d9a769e01887c1ccf797
author huans <huans@google.com> Thu Jan 24 11:04:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 11:04:41 2019 -0800
tree 2731a18b38f92aa8c261b0721bf22641c95eb8a1
parent 07d3520062749e7842efd4813285443131ff0927
parent 6b1e9426b1b4d78cb3b6c46f026b7218ddbbb647

Merge "Merge "do ae/awb based on Camera capability" into nougat-cts-dev am: 4a1650647f" into nougat-mr1-cts-dev
am: 6b1e9426b1

Change-Id: I42e26a4d8602b2513820c5fff5d56fd46f609364

apps/CameraITS/tools/validate_scene.py

diff --git a/apps/CameraITS/tools/validate_scene.py b/apps/CameraITS/tools/validate_scene.py
index cfe14e2..1c0f0fd 100644
--- a/apps/CameraITS/tools/validate_scene.py
+++ b/apps/CameraITS/tools/validate_scene.py
@@ -49,8 +49,9 @@
                 " to frame the test scene: " + scene_name +
                 "\nThe scene setup should be: " + scene_desc )
         # Converge 3A prior to capture.
-        cam.do_3a(do_af=do_af, lock_ae=True, lock_awb=True)
         props = cam.get_camera_properties()
+        cam.do_3a(do_af=do_af, lock_ae=its.caps.ae_lock(props),
+                  lock_awb=its.caps.awb_lock(props))
         req = its.objects.fastest_auto_capture_request(props)
         if its.caps.ae_lock(props):
             req["android.control.awbLock"] = True