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

Commit 8de97dee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improve am --help wording" into main am: 3b84c2ca am: 93e16915 am: 168dba80 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787105



Change-Id: I67d847eb0ec78e22018b1d29a4c83d5a5558ce1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0deb0abc 168dba80

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4157,7 +4157,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            pw.println("      -D: enable debugging");

            pw.println("      -D: enable debugging");

            pw.println("      --suspend: debugged app suspend threads at startup (only with -D)");

            pw.println("      --suspend: debugged app suspend threads at startup (only with -D)");

            pw.println("      -N: enable native debugging");

            pw.println("      -N: enable native debugging");

            pw.println("      -W: wait for launch to complete");

            pw.println("      -W: wait for launch to complete (initial display)");

            pw.println("      --start-profiler <FILE>: start profiler and send results to <FILE>");

            pw.println("      --start-profiler <FILE>: start profiler and send results to <FILE>");

            pw.println("      --sampling INTERVAL: use sample profiling with INTERVAL microseconds");

            pw.println("      --sampling INTERVAL: use sample profiling with INTERVAL microseconds");

            pw.println("          between samples (use with --start-profiler)");

            pw.println("          between samples (use with --start-profiler)");