Camera2: Don't use VIDEO_SNAPSHOT template on LEGACY mode.
Bug: 17426630
Change-Id: I0eddda78296c5aa510baf5e94b24cc6df3a99f9f
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 faf72f3..6fee8ce 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -259,7 +259,8 @@
*/
for (int j = 0; j < sTemplates.length; j++) {
// Skip video snapshots for LEGACY mode
- if (sTemplates[j] == CameraDevice.TEMPLATE_VIDEO_SNAPSHOT) {
+ if (mStaticInfo.isHardwareLevelLegacy() &&
+ sTemplates[j] == CameraDevice.TEMPLATE_VIDEO_SNAPSHOT) {
continue;
}
CaptureRequest.Builder capReq = mCamera.createCaptureRequest(sTemplates[j]);
@@ -712,6 +713,11 @@
if (!burst) {
// Test: that a single capture of each template type succeeds.
for (int j = 0; j < sTemplates.length; j++) {
+ // Skip video snapshots for LEGACY mode
+ if (mStaticInfo.isHardwareLevelLegacy() &&
+ sTemplates[j] == CameraDevice.TEMPLATE_VIDEO_SNAPSHOT) {
+ continue;
+ }
captureSingleShot(mCameraIds[i], sTemplates[j], repeating, abort);
}
}
@@ -797,6 +803,11 @@
assertTrue("Invalid args to capture function", len <= templates.length);
List<CaptureRequest> requests = new ArrayList<CaptureRequest>();
for (int i = 0; i < len; i++) {
+ // Skip video snapshots for LEGACY mode
+ if (mStaticInfo.isHardwareLevelLegacy() &&
+ templates[i] == CameraDevice.TEMPLATE_VIDEO_SNAPSHOT) {
+ continue;
+ }
CaptureRequest.Builder requestBuilder = mCamera.createCaptureRequest(templates[i]);
assertNotNull("Failed to create capture request", requestBuilder);
requestBuilder.addTarget(mReaderSurface);
