tools/android/adb_profile_chrome/chrome_controller.py - Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and 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/android/adb_profile_chrome/chrome_controller.py

Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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

« no previous file with comments | « build/android/pylib/perf/perf_control.py ('k') | tools/memory_inspector/memory_inspector/backends/android/android_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/android/adb_profile_chrome/chrome_controller.py

diff --git a/tools/android/adb_profile_chrome/chrome_controller.py b/tools/android/adb_profile_chrome/chrome_controller.py

index 284e61390db2749fe2318f66f0cf2af5d2e8fa7d..e2ec85991bc1c65e8b046d876f38d618168cec96 100644

--- a/tools/android/adb_profile_chrome/chrome_controller.py

+++ b/tools/android/adb_profile_chrome/chrome_controller.py

@@ -68,8 +68,7 @@ class ChromeTracingController(controllers.BaseController):

if self._trace_memory:

self._device.old_interface.EnableAdbRoot()

- self._device.old_interface.system_properties \

- [_HEAP_PROFILE_MMAP_PROPERTY] = 1

+ self._device.SetProp(_HEAP_PROFILE_MMAP_PROPERTY, 1)

# Chrome logs two different messages related to tracing:

@@ -91,8 +90,7 @@ class ChromeTracingController(controllers.BaseController):

self._trace_file = self._device.old_interface.WaitForLogMatch(

self._trace_finish_re, None, timeout=120).group(1)

if self._trace_memory:

- self._device.old_interface.system_properties \

- [_HEAP_PROFILE_MMAP_PROPERTY] = 0

+ self._device.SetProp(_HEAP_PROFILE_MMAP_PROPERTY, 0)

def PullTrace(self):

# Wait a bit for the browser to finish writing the trace file.