tools/telemetry/telemetry/core/backends/android_rndis.py - Issue 99713002: Factor out a system_properties interface for interacting with getprop/setprop.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/backends/android_rndis.py

Issue 99713002: Factor out a system_properties interface for interacting with getprop/setprop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use shlex.split() 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

« build/android/pylib/system_properties.py ('K') | « tools/telemetry/telemetry/core/backends/adb_commands.py ('k') | tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/android_rndis.py

diff --git a/tools/telemetry/telemetry/core/backends/android_rndis.py b/tools/telemetry/telemetry/core/backends/android_rndis.py

index c2c0e4bbd98a561681ac4442643abdaa9c41c8db..71367469ce7989491557ecc02b5ecc3530a05207 100644

--- a/tools/telemetry/telemetry/core/backends/android_rndis.py

+++ b/tools/telemetry/telemetry/core/backends/android_rndis.py

@@ -113,7 +113,7 @@ class RndisForwarderWithRoot(object):

['sudo', 'bash', '-c', 'echo -e "%s" > %s' % (contents, path)])

def _DisableRndis(self):

- self._adb.RunShellCommand('setprop sys.usb.config adb')

+ self._adb.system_properties['sys.usb.config'] = 'adb'

self._WaitForDevice()

def _EnableRndis(self):

@@ -326,8 +326,8 @@ doit &

default_routes = [route[0] for route in routes if route[1] == '00000000']

return (

default_routes[0] if default_routes else None,

- self._adb.RunShellCommand('getprop net.dns1')[0],

- self._adb.RunShellCommand('getprop net.dns2')[0],

+ self._adb.system_properties['net.dns1'],

+ self._adb.system_properties['net.dns2'],

)

def _OverrideDns(self, iface, dns1, dns2):

@@ -341,12 +341,11 @@ doit &

return # If there is no route, then nobody cares about DNS.

# DNS proxy in older versions of Android is configured via properties.

# TODO(szym): run via su -c if necessary.

- self._adb.RunShellCommand('setprop net.dns1 ' + dns1)

- self._adb.RunShellCommand('setprop net.dns2 ' + dns2)

- dnschange = self._adb.RunShellCommand('getprop net.dnschange')[0]

+ self._adb.system_properties['net.dns1'] = dns1

+ self._adb.system_properties['net.dns2'] = dns2

+ dnschange = self._adb.system_properties['net.dnschange']

if dnschange:

- self._adb.RunShellCommand('setprop net.dnschange %s' %

- (int(dnschange) + 1))

+ self._adb.system_properties['net.dnschange'] = int(dnschange) + 1

# Since commit 8b47b3601f82f299bb8c135af0639b72b67230e6 to frameworks/base

# the net.dns1 properties have been replaced with explicit commands for netd

self._adb.RunShellCommand('ndc netd resolver setifdns %s %s %s' %