Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c022ff15 authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

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

Change-Id: I7d2292a57e882c1e80235e49dc333629a56f9481
parents e04ce887 61b5e26f

cc/test.go

+1 −3
Original line number Diff line number Diff line
@@ -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"})