Merge "Use StopServicesSetup to stop/start framework." am: 61b5e26f27

Change-Id: I7d2292a57e882c1e80235e49dc333629a56f9481
This commit is contained in:
Dan Shi 2020-05-13 16:29:23 +00:00 committed by Automerger Merge Worker
commit c022ff15b1

View file

@ -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"})