| commit | f71ac1d192056275bad224f672658f6b41293df9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 30 19:01:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 19:01:11 2020 +0000 |
| tree | e709dd14a943f3630baff2e40665417e8180738b | |
| parent | 468fc1b9c8fcf2cb43ab6bbe2998c3cd523e3744 [diff] | |
| parent | e86af079583cad41bed45013846293252731205a [diff] |
Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010 am: 7b04738823 am: 796dde65c0 am: e86af07958 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144 Change-Id: I020045e2eb9cff3b4a0d6f9c830ae86c92c4c2fd
diff --git a/camera/provider/2.4/vts/functional/AndroidTest.xml b/camera/provider/2.4/vts/functional/AndroidTest.xml index 05e1639..3000c0e 100644 --- a/camera/provider/2.4/vts/functional/AndroidTest.xml +++ b/camera/provider/2.4/vts/functional/AndroidTest.xml
@@ -28,6 +28,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalCameraProviderV2_4TargetTest" /> - <option name="native-test-timeout" value="180000"/> + <option name="native-test-timeout" value="1800000"/> <!-- 30 min --> </test> </configuration>