| commit | 44560d68b3e6c2695b8f118d40eb4464dbc43863 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 22 19:16:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 22 19:16:42 2022 +0000 |
| tree | 4cc9f61dfedb6db5119eaef990e59671c6fc193b | |
| parent | 0a8210bf7078f85371184aaea03a7c23552ec43e [diff] | |
| parent | 3e583c0d2094dea62f3c85cf06a62dc08afc41f6 [diff] |
Merge "Revert "Fix use-after-free in GnssMesaurementInterface"" into tm-dev am: 9a7e193760 am: e7641d45c5 am: 3e583c0d20 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17908714 Change-Id: Ic5ddc18cd7e70e7d209dbb6feaf8bbbeb19ed529 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>