summaryrefslogtreecommitdiffstats
path: root/camera/provider
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-30 18:01:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-30 18:01:02 +0000
commitef7bf24010d72eaf71580eb594e1e6a2882894e8 (patch)
tree93749995dadf4b8a427d305449f5996d819b1fb4 /camera/provider
parentf04be179a7b7c0c2a4c80ee725c9402a4751fe09 (diff)
parentf65225671ced6093b4ffeb222b3952924434f23b (diff)
downloadplatform_hardware_interfaces-ef7bf24010d72eaf71580eb594e1e6a2882894e8.tar.gz
platform_hardware_interfaces-ef7bf24010d72eaf71580eb594e1e6a2882894e8.tar.bz2
platform_hardware_interfaces-ef7bf24010d72eaf71580eb594e1e6a2882894e8.zip
Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev
Diffstat (limited to 'camera/provider')
-rw-r--r--camera/provider/2.4/vts/functional/AndroidTest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/provider/2.4/vts/functional/AndroidTest.xml b/camera/provider/2.4/vts/functional/AndroidTest.xml
index 05e16394d6..3000c0e3a6 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>