[Android] Switch KillAll, StartActivity, and BroadcastIntent to DeviceUtils.

build/android/pylib/device/device_utils.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=W0613
 
@@ skipping 280 matching lines @@
     if check_return:
       code, output = self.old_interface.GetShellCommandStatusAndOutput(
           cmd, timeout_time=timeout)
       if int(code) != 0:
         raise device_errors.CommandFailedError(
             cmd, 'Nonzero exit code (%d)' % code)
     else:
       output = self.old_interface.RunShellCommand(cmd, timeout_time=timeout)
     return output
 
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def KillAll(self, process_name, signum=9, root=False, blocking=False,

[Sami, 2014/06/17 20:39:11]

ditto about signal.SIGKILL.

[jbudorick, 2014/06/17 21:09:27]

Done.

+              timeout=None, retries=None):
+    """Kill all processes with the given name on the device.
+
+    Args:
+      process_name: A string containing the name of the process to kill.
+      signum: An integer containing the signal number to send to kill. Defaults
+              to 9 (SIGKILL).
+      root: A boolean indicating whether the kill should be executed with root
+            priveleges.
+      blocking: A boolean indicating whether we should wait until all processes
+                with the given |process_name| are dead.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    """
+    if blocking:
+      self.old_interface.KillAllBlocking(process_name, signum=signum,
+          with_su=root, timeout_sec=timeout)
+    else:
+      self.old_interface.KillAll(process_name, signum=signum, with_su=root)
+
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def StartActivity(self, intent, blocking=False, trace_file_name=None,
+                    force_stop=False, timeout=None, retries=None):
+    """Start package's activity on the device.
+
+    Args:
+      intent: An Intent to send.
+      blocking: A boolean indicating whether we should wait for the activity to
+                finish launching.
+      trace_file_name: If present, a string that both indicates that we want to
+                       profile the activity and contains the path to which the
+                       trace should be saved.
+      force_stop: A boolean indicating whether we should stop the activity
+                  before starting it.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    """
+    self.old_interface.StartActivity(
+        intent.package, intent.activity, wait_for_completion=blocking,
+        action=intent.action, category=intent.category, data=intent.data,
+        extras=intent.extras, trace_file_name=trace_file_name,
+        force_stop=force_stop, flags=intent.flags)
+
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def StartActivityTimed(self, intent, blocking=False, trace_file_name=None,
+                         force_stop=False, timeout=None, retries=None):

[Victor Starodub, 2014/06/17 18:43:42]

Why do we need both this and previous method? Can't we just ignore the return
value?

[jbudorick, 2014/06/17 21:09:27]

This is a good question, and one to which I don't have a good answer. I suspect
that it might be because the clients who don't care about the start time don't
want to do the extra work of determining the start time. I'm not sure that's a
reason to separate the two, though.

That said, _nothing_ calls StartActivityTimed, so I'm just going to remove it
altogether.

+    """Start package's activity on the device and return the start time.
+
+    Args:
+      intent: Same as for |StartActivity|.
+      blocking: Same as for |StartActivity|.
+      trace_file_name: Same as for |StartActivity|.
+      force_stop: Same as for |StartActivity|.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    Returns:
+      The start time of the activity.

[frankf, 2014/06/17 18:45:44]

can you clarify whether this is device or host time and in wihch format

[jbudorick, 2014/06/17 21:09:27]

removing this function as noted above

+    """
+    return self.old_interface.StartActivityTimed(
+        intent.package, intent.activity, wait_for_completion=blocking,
+        action=intent.action, category=intent.category, data=intent.data,
+        extras=intent.extras, trace_file_name=trace_file_name,
+        force_stop=force_stop, flags=intent.flags)
+
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def BroadcastIntent(self, intent, timeout=None, retries=None):
+    """Send a broadcast intent.
+
+    Args:
+      intent: An Intent to broadcast.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    """
+    package, old_intent = intent.action.rsplit('.', 1)
+    if intent.extras is None:
+      args = []
+    else:
+      args = ['-e %s%s' % (k, ' "%s"' % v if v else '')
+              for k, v in intent.extras.items() if len(k) > 0]
+    self.old_interface.BroadcastIntent(package, old_intent, *args)
+
   def __str__(self):
     """Returns the device serial."""
     return self.old_interface.GetDevice()
 
   @staticmethod
   def parallel(devices=None, async=False):
     """Creates a Parallelizer to operate over the provided list of devices.
 
     If |devices| is either |None| or an empty list, the Parallelizer will
     operate over all attached devices.
 
     Args:
       devices: A list of either DeviceUtils instances or objects from
                from which DeviceUtils instances can be constructed. If None,
                all attached devices will be used.
       async: If true, returns a Parallelizer that runs operations
              asynchronously.
     Returns:
       A Parallelizer operating over |devices|.
     """
     if not devices or len(devices) == 0:
       devices = pylib.android_commands.GetAttachedDevices()
     parallelizer_type = (parallelizer.Parallelizer if async
                          else parallelizer.SyncParallelizer)
     return parallelizer_type([
         d if isinstance(d, DeviceUtils) else DeviceUtils(d)
         for d in devices])