| commit | 8f3632ab1779651075e3d49f8e67bce2002d9ade | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 22 02:53:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 22 02:53:19 2022 +0000 |
| tree | 4d37c456d3f40b10aa8e405bcb9b1876a89e3c53 | |
| parent | 1793db8c1d677468b1d6ee91efa225699460ee67 [diff] | |
| parent | 888a6a427ece116d9a1358ca1dd6660fcaa0d1f6 [diff] |
Merge "Exclude timed power entities due to timeout mechanism" into tm-dev am: 217f6ccef4 am: 888a6a427e Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17818064 Change-Id: Id79d782007666514e9f0b2c98fea23ec7513ce7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml index ae57125..1e73f8a 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml
@@ -34,6 +34,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalAudioV6_0TargetTest" /> - <option name="native-test-timeout" value="5m" /> + <option name="native-test-timeout" value="10m" /> </test> </configuration>
diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV7_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV7_0TargetTest.xml index 55dbaf1..f0e2695 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV7_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV7_0TargetTest.xml
@@ -34,6 +34,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalAudioV7_0TargetTest" /> - <option name="native-test-timeout" value="5m" /> + <option name="native-test-timeout" value="10m" /> </test> </configuration>
diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV7_1TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV7_1TargetTest.xml index 7b33a8f..7ce1477 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV7_1TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV7_1TargetTest.xml
@@ -34,6 +34,6 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="VtsHalAudioV7_1TargetTest" /> - <option name="native-test-timeout" value="5m" /> + <option name="native-test-timeout" value="10m" /> </test> </configuration>