diff options
| author | Dan Shi <dshi@google.com> | 2020-05-13 18:19:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-13 18:19:37 +0000 |
| commit | 3b6534e36d3d24f6190f3e5e1962984537ad6c0c (patch) | |
| tree | 203fb6e9bcbb87672802ab0781f2aa67fb938870 /audio | |
| parent | 0d5d5cd8754f33e6b09d1a1f2cec34f2c8cfb6f1 (diff) | |
| parent | 95d430d6c8a20fa4966f78f83c1b2f6ba8dadf72 (diff) | |
| download | platform_hardware_interfaces-3b6534e36d3d24f6190f3e5e1962984537ad6c0c.tar.gz platform_hardware_interfaces-3b6534e36d3d24f6190f3e5e1962984537ad6c0c.tar.bz2 platform_hardware_interfaces-3b6534e36d3d24f6190f3e5e1962984537ad6c0c.zip | |
Use StopServicesSetup to stop/start framework. am: 8a648312f8 am: 95d430d6c8
Change-Id: I96a02ab530d4efd386c5f835bbb932e62ea8ea7d
Diffstat (limited to 'audio')
8 files changed, 16 insertions, 32 deletions
diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml index 67fcdb64c3..3793bb5caa 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml index 2084060703..f74ca1cf78 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml index 8b01e41fec..ccbb6295cc 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml index 05edc0dc7d..f035bafa29 100644 --- a/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV2_0TargetTest.xml b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV2_0TargetTest.xml index b6e720b711..36d9324a64 100644 --- a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV2_0TargetTest.xml +++ b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV2_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV4_0TargetTest.xml b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV4_0TargetTest.xml index df826c8dd7..091a4dc6a7 100644 --- a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV4_0TargetTest.xml +++ b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV4_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV5_0TargetTest.xml b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV5_0TargetTest.xml index 14bdf432b4..14e90a1f8f 100644 --- a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV5_0TargetTest.xml +++ b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV5_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> diff --git a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV6_0TargetTest.xml b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV6_0TargetTest.xml index 23adad0d22..8b6c08f1d1 100644 --- a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV6_0TargetTest.xml +++ b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectV6_0TargetTest.xml @@ -17,13 +17,11 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-native" /> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="stop"/> <option name="run-command" value="setprop vts.native_server.on 1"/> - <option name="teardown-command" value="start"/> <option name="teardown-command" value="setprop vts.native_server.on 0"/> </target_preparer> |