tools/memory_inspector/memory_inspector/backends/android/android_backend.py - Issue 358993003: [Android] Switch to DeviceUtils versions of file functions.

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/memory_inspector/memory_inspector/backends/android/android_backend.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

« no previous file with comments | « tools/android/adb_profile_chrome/perf_controller.py ('k') | tools/memory_inspector/memory_inspector/backends/android/android_backend_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/memory_inspector/memory_inspector/backends/android/android_backend.py

diff --git a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py b/tools/memory_inspector/memory_inspector/backends/android/android_backend.py

index 2116bb6f86a8e613b779c130e616612bba4b3de7..8fcfebf36a5572c1e1d4a3a4a02a02545796f2b4 100644

--- a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py

+++ b/tools/memory_inspector/memory_inspector/backends/android/android_backend.py

@@ -327,8 +327,7 @@ class AndroidProcess(backends.Process):

# TODO(primiano): Some pre-KK versions of Android might need a sleep here

# as, IIRC, 'am dumpheap' did not wait for the dump to be completed before

# returning. Double check this and either add a sleep or remove this TODO.

- dump_out = self.device.underlying_device.old_interface.GetFileContents(

- dump_file_path)

+ dump_out = self.device.underlying_device.ReadFile(dump_file_path)

self.device.underlying_device.RunShellCommand('rm %s' % dump_file_path)

return dumpheap_native_parser.Parse(dump_out)