Commit fb513d1e authored by ilevy@chromium.org's avatar ilevy@chromium.org

Silence adb command output by default

- Cherrypick from downstream
  https://gerrit-int.chromium.org/#/c/23445/

Review URL: https://chromiumcodereview.appspot.com/10657017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152449 0039d316-1c4b-4281-b951-d872f2087c98
parent 86cfc5ee
......@@ -436,7 +436,7 @@ class AndroidCommands(object):
# possible without using a private (local) adb_shell instance (to ensure no
# other command interleaves usage of it), which would defeat the main aim of
# being able to reuse the adb shell instance across commands.
def RunShellCommand(self, command, timeout_time=20, log_result=True):
def RunShellCommand(self, command, timeout_time=20, log_result=False):
"""Send a command to the adb shell and return the result.
Args:
......@@ -584,7 +584,7 @@ class AndroidCommands(object):
if not re.search('^[0-9]', output.splitlines()[-1]):
logging.critical('PUSH FAILED: ' + output)
def GetFileContents(self, filename, log_result=True):
def GetFileContents(self, filename, log_result=False):
"""Gets contents from the file specified by |filename|."""
return self.RunShellCommand('if [ -f "' + filename + '" ]; then cat "' +
filename + '"; fi', log_result=log_result)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment