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

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

Merge "Add extra help for dumpsys meminfo --unreachable, --logstats" into main... 

Merge "Add extra help for dumpsys meminfo --unreachable, --logstats" into main am: f740e50a am: bb7f4f03

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



Change-Id: I6690ed8a234ebcb472ae6fe7f31763edbc0da271
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fa14b71 bb7f4f03

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

+3 −1
Original line number Diff line number Diff line
@@ -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;