commit d88a8a4cb6e0534addfa6d74b21e791a9ce022e1
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Mar 07 16:41:48 2016 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Mar 09 16:38:56 2016 -0800
tree cb29a9960a24d07854be01a1d86524a219849198
parent d7f99c86b2c7261e33e481c9943833b3c371097f

Camera: fix AE convergence wait logic

CONTROL_AE_STATE_FLASH_REQUIRED is a valid state of convergence
even when flash control is off.

Bug: 26687963
Change-Id: I7bea76aa9791c031cb6bdf31c660a9241bdfc24e

tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
index 6488cc6..0db4a0a 100644
--- a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
@@ -687,8 +687,9 @@
                 @Override
                 public void onCaptureProgressed(CameraCaptureSession session,
                         CaptureRequest request, CaptureResult partialResult) {
-                    if (partialResult.get(CaptureResult.CONTROL_AE_STATE) ==
-                            CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
+                    int aeState = partialResult.get(CaptureResult.CONTROL_AE_STATE);
+                    if (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
+                            aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
                         waitForAeCondition.open();
                     }
                 }
@@ -696,8 +697,9 @@
                 @Override
                 public void onCaptureCompleted(CameraCaptureSession session,
                         CaptureRequest request, TotalCaptureResult result) {
-                    if (result.get(CaptureResult.CONTROL_AE_STATE) ==
-                            CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
+                    int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+                    if (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
+                            aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
                         waitForAeCondition.open();
                     }
                 }