Allow android pass flags to am start activity

build/android/pylib/android_commands.py

 # Copyright (c) 2012 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 an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 617 matching lines @@
       wait_period = 0.1
       # Note that this doesn't take into account the time spent in ExtractPid().
       while self.ExtractPid(process) and elapsed < timeout_sec:
         time.sleep(wait_period)
         elapsed += wait_period
       if elapsed >= timeout_sec:
         return 0
     return processes_killed
 
   def _GetActivityCommand(self, package, activity, wait_for_completion, action,
-                          category, data, extras, trace_file_name, force_stop):
+                          category, data, extras, trace_file_name, force_stop,
+                          flags):
     """Creates command to start |package|'s activity on the device.
 
     Args - as for StartActivity
 
     Returns:
       the command to run on the target to start the activity
     """
     cmd = 'am start -a %s' % action
     if force_stop:
       cmd += ' -S'
@@ skipping 13 matching lines @@
         elif isinstance(value, bool):
           cmd += ' --ez'
         elif isinstance(value, int):
           cmd += ' --ei'
         else:
           raise NotImplementedError(
               'Need to teach StartActivity how to pass %s extras' % type(value))
         cmd += ' %s %s' % (key, value)
     if trace_file_name:
       cmd += ' --start-profiler ' + trace_file_name
+    if flags:
+      cmd += ' -f %s' % flags
     return cmd
 
   def StartActivity(self, package, activity, wait_for_completion=False,
                     action='android.intent.action.VIEW',
                     category=None, data=None,
                     extras=None, trace_file_name=None,
-                    force_stop=False):
+                    force_stop=False, flags=None):
     """Starts |package|'s activity on the device.
 
     Args:
       package: Name of package to start (e.g. 'com.google.android.apps.chrome').
       activity: Name of activity (e.g. '.Main' or
         'com.google.android.apps.chrome.Main').
       wait_for_completion: wait for the activity to finish launching (-W flag).
       action: string (e.g. "android.intent.action.MAIN"). Default is VIEW.
       category: string (e.g. "android.intent.category.HOME")
       data: Data string to pass to activity (e.g. 'http://www.example.com/').
       extras: Dict of extras to pass to activity. Values are significant.
       trace_file_name: If used, turns on and saves the trace to this file name.
       force_stop: force stop the target app before starting the activity (-S
         flag).
     """
     cmd = self._GetActivityCommand(package, activity, wait_for_completion,
                                    action, category, data, extras,
-                                   trace_file_name, force_stop)
+                                   trace_file_name, force_stop, flags)
     self.RunShellCommand(cmd)
 
   def StartActivityTimed(self, package, activity, wait_for_completion=False,
                          action='android.intent.action.VIEW',
                          category=None, data=None,
                          extras=None, trace_file_name=None,
-                         force_stop=False):
+                         force_stop=False, flags=None):
     """Starts |package|'s activity on the device, returning the start time
 
     Args - as for StartActivity
 
     Returns:
       a timestamp string for the time at which the activity started
     """
     cmd = self._GetActivityCommand(package, activity, wait_for_completion,
                                    action, category, data, extras,
-                                   trace_file_name, force_stop)
+                                   trace_file_name, force_stop, flags)
     self.StartMonitoringLogcat()
     self.RunShellCommand('log starting activity; ' + cmd)
     activity_started_re = re.compile('.*starting activity.*')
     m = self.WaitForLogMatch(activity_started_re, None)
     assert m
     start_line = m.group(0)
     return GetLogTimestamp(start_line, self.GetDeviceYear())
 
   def GoHome(self):
     """Tell the device to return to the home screen. Blocks until completion."""
@@ skipping 818 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()