Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0e0014d authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

resolve merge conflicts of 7a52b757 to nyc-dev-plus-aosp 

am: 8be87cd8

* commit '8be87cd8':
  Switch to more conventional ps arguments in dumpstate.

Change-Id: Ie121681a02c7eb691a165685eb01f4d6e52586f7
parents a7106e11 8be87cd8

cmds/dumpstate/dumpstate.cpp

+2 −1
Original line number Diff line number Diff line
@@ -649,7 +649,8 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
    dump_file("KERNEL CPUFREQ", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");

    dump_file("KERNEL SYNC", "/d/sync");



    run_command("PROCESSES AND THREADS", 10, "ps", "-Z", "-t", "-p", "-P", NULL);

    run_command("PROCESSES AND THREADS", 10, "toybox", "ps", "-A", "-T", "-Z",

                "-O", "pri,nice,rtprio,sched,pcy", NULL);

    run_command("LIBRANK", 10, SU_PATH, "root", "librank", NULL);



    run_command("PRINTENV", 10, "printenv", NULL);