From 77aab7c0527ebead6404dd10f30c7df75afbfe8e Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Wed, 22 Nov 2017 14:14:41 -0800 Subject: [PATCH] Change dump priority for meminfo - change meminfo dump priority to HIGH (temp workaround until parallel dump is implemented) - pass in -a args to meminfo dump Bug: 27429130 Test: Manual verification Test: https://docs.google.com/a/google.com/spreadsheets/d/1tbTWM7DD2nJd-3F1kMYZRiCFOUOnhhXOEk51SmJg9-A/edit?usp=sharing Change-Id: I069e814049efe6bb9acba7e9c1889ffd789d287b --- .../com/android/server/am/ActivityManagerService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ae91b8208b729..aa8a36627ef1f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2494,7 +2494,7 @@ public class ActivityManagerService extends IActivityManager.Stub DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PROTO); ServiceManager.addService(ProcessStats.SERVICE_NAME, mProcessStats); ServiceManager.addService("meminfo", new MemBinder(this), /* allowIsolated= */ false, - DUMP_FLAG_PRIORITY_HIGH | DUMP_FLAG_PRIORITY_NORMAL); + DUMP_FLAG_PRIORITY_HIGH); ServiceManager.addService("gfxinfo", new GraphicsBinder(this)); ServiceManager.addService("dbinfo", new DbBinder(this)); if (MONITOR_CPU_USAGE) { @@ -2552,9 +2552,15 @@ public class ActivityManagerService extends IActivityManager.Stub private final PriorityDump.PriorityDumper mPriorityDumper = new PriorityDump.PriorityDumper() { @Override - public void dumpNormal(FileDescriptor fd, PrintWriter pw, String[] args, + public void dumpHigh(FileDescriptor fd, PrintWriter pw, String[] args, boolean asProto) { if (asProto) return; + mActivityManagerService.dumpApplicationMemoryUsage(fd, + pw, " ", new String[] {"-a"}, false, null); + } + @Override + public void dump(FileDescriptor fd, PrintWriter pw, String[] args, boolean asProto) { + if (asProto) return; mActivityManagerService.dumpApplicationMemoryUsage(fd, pw, " ", args, false, null); } };