commit cd47557c626cc6125622c9d1ce3e5723474366ec
author Igor Tolkov <itolkov@google.com> Fri Aug 18 07:57:21 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 18 07:57:21 2023 +0000
tree b371469cda173dff3a3b35e4f5cfb9c28ece143d
parent c8b9250b82f25903f07ef4ab83f411ec2af40deb
parent 12320fd0716a525cb47c8f85951416588ae7e7d3

Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711b5 am: 12320fd071

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2709435

Change-Id: Id19f7f18a9a374e92a5790240adf260aa1f92b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml

diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
index 6010c60..c23d687 100644
--- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
+++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
@@ -19,8 +19,6 @@
 
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup">
-    </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
@@ -31,6 +29,9 @@
         <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
     </target_preparer>
 
+    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup">
+    </target_preparer>
+
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push" value="VtsHalBluetoothV1_0TargetTest->/data/local/tmp/VtsHalBluetoothV1_0TargetTest" />