CTS: Relax LEGACY capture timeout.
- Relax timeout in StillCaptureTest#testStillPreviewCombination
on LEGACY devices for capture.
Bug: 19255187
Change-Id: Ie1e7d60da4eb52e30a880d177f20eadda9c2102a
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
index c6da122..8d0b0b3 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -71,6 +71,7 @@
private static final Location sTestLocation0 = new Location(LocationManager.GPS_PROVIDER);
private static final Location sTestLocation1 = new Location(LocationManager.GPS_PROVIDER);
private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);
+ private static final int RELAXED_CAPTURE_IMAGE_TIMEOUT_MS = CAPTURE_IMAGE_TIMEOUT_MS + 1000;
static {
sTestLocation0.setTime(1199145600L);
sTestLocation0.setLatitude(37.736071);
@@ -637,7 +638,8 @@
prepareStillCaptureAndStartPreview(previewRequest, stillRequest, previewSz,
stillSz, resultListener, imageListener);
mSession.capture(stillRequest.build(), resultListener, mHandler);
- Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
+ Image image = imageListener.getImage((mStaticInfo.isHardwareLevelLegacy()) ?
+ RELAXED_CAPTURE_IMAGE_TIMEOUT_MS : CAPTURE_IMAGE_TIMEOUT_MS);
validateJpegCapture(image, stillSz);
// stopPreview must be called here to make sure next time a preview stream
// is created with new size.