commit 7ed0d64f29a8fc1e951aad60a9ec15259d572295
author Tri Vo <trong@google.com> Wed Jan 18 09:56:48 2017 -0800
committer Tri Vo <trong@google.com> Wed Jan 18 23:23:54 2017 +0000
tree f775378f6dac62ed438b1813ad4b6be2acdcf9c1
parent c6e73262a6a8d8f7958b8cf9771e932598336e01

Ability to register controller without starting vts services.
Enable HwBinderBinerizePerformanceAdbTest.

Test: rm -rf  out/host/linux-x86/vts && make vts -j64 && vts-tradefed
run commandAndExit vts --skip-all-system-status-check --primary-abi-only
--skip-preconditions --module HwBinderBinderizePerformanceAdbTest -l
VERBOSE
Change-Id: I6be846252832faa2dff397f92912357a2477c6e9

utils/python/controllers/android_device.py

diff --git a/utils/python/controllers/android_device.py b/utils/python/controllers/android_device.py
index 1b31091..31e89e9 100644
--- a/utils/python/controllers/android_device.py
+++ b/utils/python/controllers/android_device.py
@@ -62,12 +62,13 @@
     pass
 
 
-def create(configs):
+def create(configs, start_services=True):
     """Creates AndroidDevice controller objects.
 
     Args:
         configs: A list of dicts, each representing a configuration for an
                  Android device.
+        start_services: boolean, controls whether services will be started.
 
     Returns:
         A list of AndroidDevice objects.
@@ -89,7 +90,8 @@
         if ad.serial not in connected_ads:
             raise DoesNotExistError(("Android device %s is specified in config"
                                      " but is not attached.") % ad.serial)
-    _startServicesOnAds(ads)
+    if start_services:
+        _startServicesOnAds(ads)
     return ads
 
 
@@ -590,7 +592,7 @@
         self.adb.shell("start")
         self.waitForBootCompletion()
 
-    def reboot(self):
+    def reboot(self, restart_services=True):
         """Reboots the device and wait for device to complete booting.
 
         This is probably going to print some error messages in console. Only
@@ -603,19 +605,24 @@
         if self.isBootloaderMode:
             self.fastboot.reboot()
             return
-        has_adb_log = self.isAdbLogcatOn
-        has_vts_agent = True if self.vts_agent_process else False
-        if has_adb_log:
-            self.stopAdbLogcat()
-        if has_vts_agent:
-            self.stopVtsAgent()
+
+        if restart_services:
+            has_adb_log = self.isAdbLogcatOn
+            has_vts_agent = True if self.vts_agent_process else False
+            if has_adb_log:
+                self.stopAdbLogcat()
+            if has_vts_agent:
+                self.stopVtsAgent()
+
         self.adb.reboot()
         self.waitForBootCompletion()
         self.rootAdb()
-        if has_adb_log:
-            self.startAdbLogcat()
-        if has_vts_agent:
-            self.startVtsAgent()
+
+        if restart_services:
+            if has_adb_log:
+                self.startAdbLogcat()
+            if has_vts_agent:
+                self.startVtsAgent()
 
     def startServices(self):
         """Starts long running services on the android device.