commit 16f3e688d994e90995daf56d4c4226b00782e7de
author Mathieu Desrochers Laflamme <mathieu.desrocherslaflamme@humanware.com> Wed Aug 28 14:54:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 14:54:38 2019 -0700
tree f42b967b945ddcb9ef86792eb659e6f4592fd214
parent 01bb00902cdeed2b76e2fa3c3f91a7dd8199315c
parent a248ca60a8396a83691e36ceb57fc83dccac2dee

Merge "Merge "Merge "Merge "Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev am: 69d80dae08" into oreo-cts-dev am: 897e9c043f" into oreo-mr1-cts-dev am: 4bfd819237" into pie-cts-dev am: eb75875c42"
am: a248ca60a8

Change-Id: Ie0d4d7d5bd285b56278f8dd94a8cd0244988940f

tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
index b7510e6..d108600e 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
@@ -65,7 +65,7 @@
     private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
 
     private static final int CONFIGURE_TIMEOUT = 5000; //ms
-    private static final int CAPTURE_TIMEOUT = 1000; //ms
+    private static final int CAPTURE_TIMEOUT = 1500; //ms
 
     // For testTriggerInteractions
     private static final int PREVIEW_WARMUP_FRAMES = 60;