diff options
| author | 2024-08-27 02:22:55 +0000 | |
|---|---|---|
| committer | 2024-08-27 02:22:55 +0000 | |
| commit | bcd84fe2640ed19c8bf91e6565ad5220b2348b4c (patch) | |
| tree | f3d36621a863efa9ad865ad1ed7614d1aba089ad | |
| parent | 3fa14b71f2183036a681a68050c813e722af862b (diff) | |
| parent | bb7f4f03c7ad5f1515dda8909f0e646ac3b6968d (diff) | |
Merge "Add extra help for dumpsys meminfo --unreachable, --logstats" into main am: f740e50a2b am: bb7f4f03c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3048327
Change-Id: I6690ed8a234ebcb472ae6fe7f31763edbc0da271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f1bdc05cce3c..b599a2fe64fe 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12158,7 +12158,7 @@ public class ActivityManagerService extends IActivityManager.Stub opts.dumpProto = true; } else if ("--logstats".equals(opt)) { opts.mDumpAllocatorStats = true; - } else if ("-h".equals(opt)) { + } else if ("-h".equals(opt) || "--help".equals(opt)) { pw.println("meminfo dump options: [-a] [-d] [-c] [-s] [--oom] [process]"); pw.println(" -a: include all available information for each process."); pw.println(" -d: include dalvik details."); @@ -12172,6 +12172,8 @@ public class ActivityManagerService extends IActivityManager.Stub pw.println(" processes that have loaded that package."); pw.println(" --checkin: dump data for a checkin"); pw.println(" --proto: dump data to proto"); + pw.println(" --logstats: log native allocator statistics."); + pw.println(" --unreachable: dump unreachable native memory with libmemunreachable."); pw.println("If [process] is specified it can be the name or "); pw.println("pid of a specific process to dump."); return; |