devil/devil/android/flag_changer.py - Issue 2275863002: [devil] Use /data/local/tmp for the command line on eng + userdebug builds.

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: devil/devil/android/flag_changer.py

Issue 2275863002: [devil] Use /data/local/tmp for the command line on eng + userdebug builds. (Closed) Base URL: git@github.com:catapult-project/catapult.git@master

Patch Set: prereview: remove leftover pdb.set_trace Created 4 years, 4 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: devil/devil/android/flag_changer.py

diff --git a/devil/devil/android/flag_changer.py b/devil/devil/android/flag_changer.py

index 4267f117a07df65da62ec90f57c00559197c874b..01b407cd89bd0f4e34d644df89c338f5405102c6 100644

--- a/devil/devil/android/flag_changer.py

+++ b/devil/devil/android/flag_changer.py

@@ -24,9 +24,11 @@ class FlagChanger(object):

"""

self._device = device

- # Unrooted devices have limited access to the file system.

+ # Unrooted devices have limited access to the file system,

+ # as do all devices on Nougat thanks to tighter SELinux controls.

# Place files in /data/local/tmp/ rather than /data/local/

- if not device.HasRoot() and not '/data/local/tmp/' in cmdline_file:

+ if ((not device.HasRoot() or device.build_type in ('eng', 'userdebug'))

+ and not '/data/local/tmp/' in cmdline_file):

self._cmdline_file = cmdline_file.replace('/data/local/',

'/data/local/tmp/')

else:

« no previous file with comments | « no previous file | no next file » | no next file with comments »