From 30ed3d4ce91d3d6203f06700c67b722acf60da62 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Wed, 13 May 2020 16:29:23 +0000 Subject: [PATCH] Use StopServicesSetup to stop/start framework. Bug: 155774142 Test: atest VtsHalWifiV1_2TargetTest (update Android.bp with disable_framework: true) Change-Id: I5d5326f415352d50ace7f456d29b257d1d769318 Merged-In: I5d5326f415352d50ace7f456d29b257d1d769318 --- cc/test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cc/test.go b/cc/test.go index b1f8eec53..95abfbf66 100644 --- a/cc/test.go +++ b/cc/test.go @@ -345,9 +345,7 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) { } if Bool(test.Properties.Disable_framework) { var options []tradefed.Option - options = append(options, tradefed.Option{Name: "run-command", Value: "stop"}) - options = append(options, tradefed.Option{Name: "teardown-command", Value: "start"}) - configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RunCommandTargetPreparer", options}) + configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.StopServicesSetup", options}) } if Bool(test.testDecorator.Properties.Isolated) { configs = append(configs, tradefed.Option{Name: "not-shardable", Value: "true"})