From b2dd35aaf2473554e2e4ee0788293234121ba895 Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Fri, 29 May 2020 15:08:43 -0700
Subject: [PATCH] Disable framework for some VTS tests

The test doesn't need framework. It seems that the test can be flaky
when framework was stop/started earlier.

Bug: 154445273
Test: atest -a VtsHalBluetoothV1_0TargetTest \
  VtsHalSapV1_0TargetTest \
  VtsHalAudioV4_0TargetTest

Change-Id: I60f62923cfb826c5e33e9885ea08efdbe4c8f57e
---
 bluetooth/1.0/vts/functional/Android.bp              | 1 +
 radio/1.0/vts/functional/vts_hal_sap_target_test.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp
index 463ed849f6..e9f867f5f0 100644
--- a/bluetooth/1.0/vts/functional/Android.bp
+++ b/bluetooth/1.0/vts/functional/Android.bp
@@ -26,4 +26,5 @@ cc_test {
         "general-tests",
         "vts",
     ],
+    disable_framework: true,
 }
diff --git a/radio/1.0/vts/functional/vts_hal_sap_target_test.xml b/radio/1.0/vts/functional/vts_hal_sap_target_test.xml
index 876e1fba12..d7d44773c4 100644
--- a/radio/1.0/vts/functional/vts_hal_sap_target_test.xml
+++ b/radio/1.0/vts/functional/vts_hal_sap_target_test.xml
@@ -22,6 +22,8 @@
     <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
     <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" />
         <option name="push" value="VtsHalSapV1_0TargetTest->/data/local/tmp/VtsHalSapV1_0TargetTest" />