Index: build/android/pylib/android_commands.py |
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py |
index b8b407333f9a9269d019393abbe9f33758494951..41b97b85c483657b2ffd196fff38b678b98ca212 100644 |
--- a/build/android/pylib/android_commands.py |
+++ b/build/android/pylib/android_commands.py |
@@ -771,14 +771,12 @@ class AndroidCommands(object): |
assert build_type |
return build_type |
- def StartMonitoringLogcat(self, clear=True, timeout=10, logfile=None, |
- filters=None): |
+ def StartMonitoringLogcat(self, clear=True, logfile=None, filters=None): |
"""Starts monitoring the output of logcat, for use with WaitForLogMatch. |
Args: |
clear: If True the existing logcat output will be cleared, to avoiding |
matching historical output lurking in the log. |
- timeout: How long WaitForLogMatch will wait for the given match |
filters: A list of logcat filters to be used. |
""" |
if clear: |
@@ -797,8 +795,7 @@ class AndroidCommands(object): |
# Spawn logcat and syncronize with it. |
for _ in range(4): |
- self._logcat = pexpect.spawn('adb', args, timeout=timeout, |
- logfile=logfile) |
+ self._logcat = pexpect.spawn('adb', args, timeout=10, logfile=logfile) |
self.RunShellCommand('log startup_sync') |
if self._logcat.expect(['startup_sync', pexpect.EOF, |
pexpect.TIMEOUT]) == 0: |
@@ -835,7 +832,7 @@ class AndroidCommands(object): |
t0 = time.time() |
while True: |
if not self._logcat: |
- self.StartMonitoringLogcat(clear, timeout=timeout) |
+ self.StartMonitoringLogcat(clear) |
try: |
while True: |
# Note this will block for upto the timeout _per log line_, so we need |