| commit | e94e1dbcaac5283518a2e4b8e330363c3a244389 | [log] [tgz] |
|---|---|---|
| author | Mathieu Desrochers Laflamme <mathieu.desrocherslaflamme@humanware.com> | Mon Jul 15 16:22:45 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 15 16:22:45 2019 -0700 |
| tree | 5ec3e9dbe33909dc806b4c74d5fff43c3f99adde | |
| parent | ed6b24d8f1e4c017cd24ef323c708da54f63e4ae [diff] | |
| parent | 69d80dae08b39e8ef6a817d33ec3fdeff4682bc1 [diff] |
Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev am: 69d80dae08 Change-Id: Iaf59dc76885f9db13fbdf96c887b68a1dd32ca64
diff --git a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java index e8995ae..51038ae 100644 --- a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
@@ -61,7 +61,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;