From 8c32f711b58b997abe0f54713b4965b41d62e65e Mon Sep 17 00:00:00 2001
From: Igor Tolkov <itolkov@google.com>
Date: Wed, 16 Aug 2023 15:24:25 +0800
Subject: [PATCH] Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest

Move StopServicesSetup after RunCommandTargetPreparer in
VtsHalBluetoothV1_0TargetTest. RunCommandTargetPreparer requires
settings service, which is not available after StopServicesSetup.

Bug: 293822620
Test: run vts -m VtsHalBluetoothV1_0TargetTest and inspect logs to make
sure no preparer steps fail.

Change-Id: I935d19c5e941bfdb122554d8c413d3095fef27ac
---
 .../1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
index 6010c60e97..c23d687382 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" />