Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3749)

Unified Diff: build/android/pylib/android_commands.py

Issue 119413005: Remove some spam output when starting Telemetry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 956b19838309353c3a8cb8ee83ade8b17c12032c..d4e17fa2640972dbc5ef10fabce5cad1799749d8 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -494,7 +494,7 @@ class AndroidCommands(object):
self._adb.SendCommand('wait-for-device')
new_adb_pids = self.ExtractPid('adbd')
if new_adb_pids == adb_pids:
- logging.error('adbd on the device may not have been restarted.')
+ logging.warning('adbd on the device may not have been restarted.')
except Exception as e:
logging.error('Exception when trying to kill adbd on the device [%s]', e)
@@ -514,7 +514,7 @@ class AndroidCommands(object):
ret = cmd_helper.RunCmd(adb_cmd)
retry = 0
while retry < 3:
- ret = cmd_helper.RunCmd(['pgrep', 'adb'])
+ ret, _ = cmd_helper.GetCmdStatusAndOutput(['pgrep', 'adb'])
if ret != 0:
# pgrep didn't find adb, kill-server succeeded.
return 0
@@ -525,10 +525,10 @@ class AndroidCommands(object):
def StartAdbServer(self):
"""Start adb server."""
adb_cmd = ['taskset', '-c', '0', constants.GetAdbPath(), 'start-server']
- ret = cmd_helper.RunCmd(adb_cmd)
+ ret, _ = cmd_helper.GetCmdStatusAndOutput(adb_cmd)
retry = 0
while retry < 3:
- ret = cmd_helper.RunCmd(['pgrep', 'adb'])
+ ret, _ = cmd_helper.GetCmdStatusAndOutput(['pgrep', 'adb'])
if ret == 0:
# pgrep found adb, start-server succeeded.
# Waiting for device to reconnect before returning success.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698