tools/android/mempressure.py - Issue 285143002: [Android] Convert to DeviceUtils versions of IsOnline, HasRoot, and EnableRoot.

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/mempressure.py

Issue 285143002: [Android] Convert to DeviceUtils versions of IsOnline, HasRoot, and EnableRoot. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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/valgrind_tools.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/mempressure.py

diff --git a/tools/android/mempressure.py b/tools/android/mempressure.py

index 82fe2206dfd252bf04f9cd05ceaca8a569f578b0..77f45a9e1cf426d2cfdda0c3c0c820e3592c1375 100755

--- a/tools/android/mempressure.py

+++ b/tools/android/mempressure.py

@@ -4,6 +4,7 @@

# found in the LICENSE file.

import collections

+import logging

import optparse

import os

import sys

@@ -86,7 +87,13 @@ def main(argv):

device = device_utils.DeviceUtils(None)

- device.old_interface.EnableAdbRoot()

+ try:

+ device.EnableRoot()

+ except device_errors.CommandFailedError as e:

+ # Try to change the flags and start the activity anyway.

+ # TODO(jbudorick) Handle this exception appropriately after interface

+ # conversions are finished.

+ logging.error(str(e))

flags = flag_changer.FlagChanger(device, package_info.cmdline_file)

if ENABLE_TEST_INTENTS_FLAG not in flags.Get():

flags.AddFlags([ENABLE_TEST_INTENTS_FLAG])