From 2d11037a0b4a9e4c4434a13e3c4b23474006febf Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Wed, 13 May 2020 14:03:24 -0700
Subject: [PATCH] Use StopServicesSetup to stop/start framework.

Bug: 155774142
Test: none
Change-Id: I3dfec18df478b0a4ae16c454d110e5c05f33cbca
---
 sensors/2.1/vts/functional/AndroidTest.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sensors/2.1/vts/functional/AndroidTest.xml b/sensors/2.1/vts/functional/AndroidTest.xml
index 0d8593e51d..2ef8dc63f0 100644
--- a/sensors/2.1/vts/functional/AndroidTest.xml
+++ b/sensors/2.1/vts/functional/AndroidTest.xml
@@ -17,13 +17,8 @@
     <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.RunCommandTargetPreparer">
-        <option name="run-command" value="stop"/>
-        <option name="teardown-command" value="start"/>
-    </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.PushFilePreparer">
         <option name="cleanup" value="true" />