diff options
| author | Dan Shi <dshi@google.com> | 2020-05-13 19:10:44 +0000 |
|---|---|---|
| committer | Dan Shi <dshi@google.com> | 2020-05-13 14:02:04 -0700 |
| commit | 1a380f7b5bf466c94be8c7f185694692b7c5bdcd (patch) | |
| tree | 8d37e57353232a9e4871abb0f409bd7f354ae8a1 /audio | |
| parent | 5254086ccc2899cf4afc7b484cc5fd61968874b6 (diff) | |
| download | platform_hardware_interfaces-1a380f7b5bf466c94be8c7f185694692b7c5bdcd.tar.gz platform_hardware_interfaces-1a380f7b5bf466c94be8c7f185694692b7c5bdcd.tar.bz2 platform_hardware_interfaces-1a380f7b5bf466c94be8c7f185694692b7c5bdcd.zip | |
Use StopServicesSetup to stop/start framework.
Bug: 155774142
Test: none
Exempt-From-Owner-Approval: This CL replaces target preparer, shouldn't
change test behavior.
Change-Id: I83cffadfff15e6352a69641c3227efb63e7a34e4
Merged-In: I83cffadfff15e6352a69641c3227efb63e7a34e4
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> |