commit b2a1e93be059ca8eeee27709c9941657a62e85dc
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Nov 12 20:54:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 20:54:57 2014 +0000
tree adb5e7c0ba0ffafbf179a67238716bd61ecad00c
parent 0bd09f2560a3050311e773294c61f84cfc929952
parent ddc2a10a59efc72b51f8c33fab3702b676e91953

Merge "Camera: test AE OFF mode only if it is supported" into lmp-sprout-dev

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);
                 }