Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ActivityManager: process stop needs a process to stop"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-09 06:50:43 +00:00
committed by Gerrit Code Review
parent 8781aa3fbe 4e6a314e73
commit e467620566
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -787,7 +787,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
return -1; return -1;
} }
} }
process = getNextArg(); process = getNextArgRequired();
} else { } else {
// Compatibility with old syntax: process is specified first. // Compatibility with old syntax: process is specified first.
process = cmd; process = cmd;
@@ -2919,15 +2919,22 @@ final class ActivityManagerShellCommand extends ShellCommand {
pw.println(" start: start tracing IPC transactions."); pw.println(" start: start tracing IPC transactions.");
pw.println(" stop: stop tracing IPC transactions and dump the results to file."); pw.println(" stop: stop tracing IPC transactions and dump the results to file.");
pw.println(" --dump-file <FILE>: Specify the file the trace should be dumped to."); pw.println(" --dump-file <FILE>: Specify the file the trace should be dumped to.");
pw.println(" profile [start|stop] [--user <USER_ID> current] [--sampling INTERVAL]"); pw.println(" profile start [--user <USER_ID> current]");
pw.println(" [--streaming] <PROCESS> <FILE>"); pw.println(" [--sampling INTERVAL | --streaming] <PROCESS> <FILE>");
pw.println(" Start and stop profiler on a process. The given <PROCESS> argument"); pw.println(" Start profiler on a process. The given <PROCESS> argument");
pw.println(" may be either a process name or pid. Options are:"); pw.println(" may be either a process name or pid. Options are:");
pw.println(" --user <USER_ID> | current: When supplying a process name,"); pw.println(" --user <USER_ID> | current: When supplying a process name,");
pw.println(" specify user of process to profile; uses current user if not specified."); pw.println(" specify user of process to profile; uses current user if not");
pw.println(" specified.");
pw.println(" --sampling INTERVAL: use sample profiling with INTERVAL microseconds"); pw.println(" --sampling INTERVAL: use sample profiling with INTERVAL microseconds");
pw.println(" between samples"); pw.println(" between samples.");
pw.println(" --streaming: stream the profiling output to the specified file"); pw.println(" --streaming: stream the profiling output to the specified file.");
pw.println(" profile stop [--user <USER_ID> current] <PROCESS>");
pw.println(" Stop profiler on a process. The given <PROCESS> argument");
pw.println(" may be either a process name or pid. Options are:");
pw.println(" --user <USER_ID> | current: When supplying a process name,");
pw.println(" specify user of process to profile; uses current user if not");
pw.println(" specified.");
pw.println(" dumpheap [--user <USER_ID> current] [-n] [-g] <PROCESS> <FILE>"); pw.println(" dumpheap [--user <USER_ID> current] [-n] [-g] <PROCESS> <FILE>");
pw.println(" Dump the heap of a process. The given <PROCESS> argument may"); pw.println(" Dump the heap of a process. The given <PROCESS> argument may");
pw.println(" be either a process name or pid. Options are:"); pw.println(" be either a process name or pid. Options are:");