| commit | 4c1cd59d3471fcdc81a510406f649c49f456bfb0 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Apr 14 12:33:18 2015 -0700 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 23 11:03:59 2015 -0700 |
| tree | 8513e6411ceafaee16fcf7754225c9019873f106 | |
| parent | 75a568d19f226c145a2cc3414fdd31cc08dc9154 [diff] |
DO NOT MERGE: Camera: don't always require ZSL template Only require ZSL template on devices supprot ZSL capability Bug: 19395059 Change-Id: I42bbd99fef6055173062266c1a490311105c6814
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java index 29c7362..43ac33b 100644 --- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java +++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -1325,6 +1325,10 @@ !mStaticInfo.isCapabilitySupported(CameraCharacteristics. REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) { // OK + } else if (template == CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG && + !mStaticInfo.isCapabilitySupported(CameraCharacteristics. + REQUEST_AVAILABLE_CAPABILITIES_ZSL)) { + // OK. } else if (sLegacySkipTemplates.contains(template) && mStaticInfo.isHardwareLevelLegacy()) { // OK