commit ddc2a10a59efc72b51f8c33fab3702b676e91953
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Nov 12 12:05:22 2014 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Nov 12 12:35:55 2014 -0800
tree f550121c9314cbbcf19c149f6314ae6f11f0b60c
parent ab5596b1e46999eb052c8e02079a6c8e2ad3ced6

Camera: test AE OFF mode only if it is supported

Bug: 18353940
Change-Id: I0c046fb17797e883339e59a5bed0d22035bd70d3

tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
index 5346ae1..ec2f95b 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
@@ -326,7 +326,13 @@
                 flashTestByAeMode(listener, CaptureRequest.CONTROL_AE_MODE_ON);
 
                 // LEGACY won't support AE mode OFF
-                if (mStaticInfo.isHardwareLevelLimitedOrBetter()) {
+                boolean aeOffModeSupported = false;
+                for (int aeMode : mStaticInfo.getAeAvailableModesChecked()) {
+                    if (aeMode == CaptureRequest.CONTROL_AE_MODE_OFF) {
+                        aeOffModeSupported = true;
+                    }
+                }
+                if (aeOffModeSupported) {
                     flashTestByAeMode(listener, CaptureRequest.CONTROL_AE_MODE_OFF);
                 }