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

Unified Diff: tools/telemetry/telemetry/core/forwarders/android_forwarder.py

Issue 358993003: [Android] Switch to DeviceUtils versions of file functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months 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
Index: tools/telemetry/telemetry/core/forwarders/android_forwarder.py
diff --git a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py
index 4c542f587d5c563ccc417ea795d2b6644ac11fc4..957ac0e9b93f69de644ea94c136ca0edf9d6096c 100644
--- a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py
+++ b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py
@@ -176,8 +176,7 @@ class AndroidRndisConfigurator(object):
def _IsRndisSupported(self):
"""Checks that the device has RNDIS support in the kernel."""
- return self._device.old_interface.FileExistsOnDevice(
- '%s/f_rndis/device' % self._RNDIS_DEVICE)
+ return self._device.FileExists('%s/f_rndis/device' % self._RNDIS_DEVICE)
def _WaitForDevice(self):
self._device.old_interface.Adb().SendCommand('wait-for-device')
@@ -202,7 +201,7 @@ class AndroidRndisConfigurator(object):
def _FindHostRndisInterface(self):
"""Returns the name of the host-side network interface."""
interface_list = self._EnumerateHostInterfaces()
- ether_address = self._device.old_interface.GetFileContents(
+ ether_address = self._device.ReadFile(
'%s/f_rndis/ethaddr' % self._RNDIS_DEVICE)[0]
interface_name = None
for line in interface_list:
@@ -255,13 +254,12 @@ function doit() {
doit &
""" % {'dev': self._RNDIS_DEVICE, 'functions': 'rndis,adb',
'prefix': script_prefix }
- self._device.old_interface.SetFileContents('%s.sh' % script_prefix, script)
+ self._device.WriteFile('%s.sh' % script_prefix, script)
# TODO(szym): run via su -c if necessary.
self._device.RunShellCommand('rm %s.log' % script_prefix)
self._device.RunShellCommand('. %s.sh' % script_prefix)
self._WaitForDevice()
- result = self._device.old_interface.GetFileContents(
- '%s.log' % script_prefix)
+ result = self._device.ReadFile('%s.log' % script_prefix)
assert any('DONE' in line for line in result), 'RNDIS script did not run!'
def _CheckEnableRndis(self, force):

Powered by Google App Engine
This is Rietveld 408576698