commit 1fc6d09b95f2d98cd90806de5b23a516f3f5cdb5
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 13 23:34:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 13 23:34:22 2017 +0000
tree d846724f845207d3549eca831d01fde2a7a65675
parent cd3a0fe97c8953eb6c1a59e42131dba3de5008a2
parent cc915e152ff22d03d777fe43af7b66e326e5b13e

Merge "The "ps" command has changed in Android O"

python-packages/gdbrunner/__init__.py

diff --git a/python-packages/gdbrunner/__init__.py b/python-packages/gdbrunner/__init__.py
index 3063c75..17b9833 100644
--- a/python-packages/gdbrunner/__init__.py
+++ b/python-packages/gdbrunner/__init__.py
@@ -86,6 +86,9 @@
     # busybox truncates the output, and very long package names like
     # 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
     # Some devices might not have readlink or which, so we need to handle
     # this as well.
@@ -95,10 +98,12 @@
 
     ps_script = """
         if $(ls /system/bin/readlink >/dev/null 2>&1); then
-          if [ $(readlink /system/bin/ps) == "toolbox" ]; then
-            ps;
-          else
+          if [ $(readlink /system/bin/ps) == "busybox" ]; then
             ps -w;
+          elif [ $(readlink /system/bin/ps) == "toybox" ]; then
+            ps -A;
+          else
+            ps;
           fi
         else
           ps;