Properly stop and start ad services in monsoon lib.
Bug=30282015
Cherry-pick of https://android-review.googlesource.com/#/c/249870/
Change-Id: Id6a12d636fe2a92fe5cc8e7f12afedb3f9558c3c
diff --git a/acts/framework/acts/controllers/monsoon.py b/acts/framework/acts/controllers/monsoon.py
index d8079d5..080be1a 100644
--- a/acts/framework/acts/controllers/monsoon.py
+++ b/acts/framework/acts/controllers/monsoon.py
@@ -831,7 +831,7 @@
self.log.info("Skip taking samples for %s" % step_name)
continue
time.sleep(1)
- self.dut.terminate_all_sessions()
+ self.dut.stop_services()
time.sleep(1)
self.log.info("Taking samples for %s." % step_name)
data = self.take_samples(hz, num, sample_offset=oset)
@@ -851,10 +851,10 @@
self._wait_for_device(self.dut)
# Wait for device to come back online.
time.sleep(10)
- droid, ed = self.dut.get_droid(True)
- ed.start()
+ self.dut.start_services(skip_sl4a=getattr(self.dut,
+ "skip_sl4a", False))
# Release wake lock to put device into sleep.
- droid.goToSleepNow()
+ self.dut.droid.goToSleepNow()
return results
def measure_power(self, hz, duration, tag, offset=30):
@@ -883,7 +883,7 @@
try:
self.usb("auto")
time.sleep(1)
- self.dut.terminate_all_sessions()
+ self.dut.stop_services()
time.sleep(1)
data = self.take_samples(hz, num, sample_offset=oset)
if not data:
@@ -898,9 +898,9 @@
self._wait_for_device(self.dut)
# Wait for device to come back online.
time.sleep(10)
- droid, ed = self.dut.get_droid(True)
- ed.start()
+ self.dut.start_services(skip_sl4a=getattr(self.dut,
+ "skip_sl4a", False))
# Release wake lock to put device into sleep.
- droid.goToSleepNow()
- self.log.info("Dut reconncted.")
+ self.dut.droid.goToSleepNow()
+ self.log.info("Dut reconnected.")
return data
