LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "The "ps" command has changed in Android O" am: 1fc6d09b95

Browse Source 
am: cb79a8c79c

Change-Id: I52e471c96a695454191fa3ed17e9cc456e69460a
This commit is contained in:
André Keller
2017-11-13 23:39:54 +00:00
committed by android-build-merger
parent 2d5e4260ef cb79a8c79c
commit cfa19cfe80
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python-packages/gdbrunner/__init__.py
View File

@@ -86,6 +86,9 @@ def get_processes(device):
# busybox truncates the output, and very long package names like # busybox truncates the output, and very long package names like
# com.exampleisverylongtoolongbyfar.plasma exceed the limit. # com.exampleisverylongtoolongbyfar.plasma exceed the limit.
# #
# API 26 use toybox instead of toolbox for ps and needs -A to list
# all processes.
#
# Perform the check for this on the device to avoid an adb roundtrip # Perform the check for this on the device to avoid an adb roundtrip
# Some devices might not have readlink or which, so we need to handle # Some devices might not have readlink or which, so we need to handle
# this as well. # this as well.
@@ -95,10 +98,12 @@ def get_processes(device):
ps_script = """ ps_script = """
if $(ls /system/bin/readlink >/dev/null 2>&1); then if $(ls /system/bin/readlink >/dev/null 2>&1); then
if [ $(readlink /system/bin/ps) == "toolbox" ]; then if [ $(readlink /system/bin/ps) == "busybox" ]; then
ps;
else
ps -w; ps -w;
elif [ $(readlink /system/bin/ps) == "toybox" ]; then
ps -A;
else
ps;
fi fi
else else
ps; ps;