commit 4b91617c26e3fd46c3a2be6ee0f7f52c6a76b3dc
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 03 21:46:18 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 21:46:18 2019 +0000
tree db5243e7aedee6b531f5c04857a157f5775558a6
parent 33e2bad2ab3944e73ea4eeeaf46217d062059fd9
parent b1158b75f63662000529c401d4f1ab3b7978f067

Merge "Camera: fix max exposure time expectation" into qt-dev

tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java

diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
index d622c23..a0b1542 100644
--- a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
@@ -389,7 +389,8 @@
                     minExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST));
             minExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST;
         }
-        if (maxExposure < SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST) {
+        if (isHardwareLevelAtLeastFull() &&
+                maxExposure < SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST) {
             failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
                     String.format(
                     "Max value %d is too small, set to minimal legal value %d",