From 6f4a2ce5a542020572808d26a2a8e6c7186080ef Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Fri, 5 Feb 2016 09:59:18 +0100 Subject: [PATCH] Fix dumpsys meminfo -c output. Also, this is supposed to be a "machine-parseable" format, but it's not versioned at all. Added a version field so we can change the format in the future if desired. Change-Id: I6aa8ea46e030def04dc10634d01557a044545a9b --- .../com/android/server/am/ActivityManagerService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5125133904c34..7b354693781c6 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -14894,7 +14894,7 @@ public final class ActivityManagerService extends ActivityManagerNative pw.println(mi.hasActivities ? ",a" : ",e"); } else { pw.print(tag); pw.print(","); pw.print(mi.shortLabel); pw.print(","); - pw.println(mi.pss); pw.print(dumpSwapPss ? mi.swapPss : "N/A"); + pw.print(mi.pss); pw.print(","); pw.println(dumpSwapPss ? mi.swapPss : "N/A"); } if (mi.subitems != null) { dumpMemItems(pw, prefix + " ", mi.shortLabel, mi.subitems, @@ -14959,6 +14959,9 @@ public final class ActivityManagerService extends ActivityManagerNative private final void dumpApplicationMemoryUsageHeader(PrintWriter pw, long uptime, long realtime, boolean isCheckinRequest, boolean isCompact) { + if (isCompact) { + pw.print("version,"); pw.println(MEMINFO_COMPACT_VERSION); + } if (isCheckinRequest || isCompact) { // short checkin version pw.print("time,"); pw.print(uptime); pw.print(","); pw.println(realtime); @@ -15017,6 +15020,9 @@ public final class ActivityManagerService extends ActivityManagerNative return stringifySize(size * 1024, 1024); } + // Update this version number in case you change the 'compact' format + private static final int MEMINFO_COMPACT_VERSION = 1; + final void dumpApplicationMemoryUsage(FileDescriptor fd, PrintWriter pw, String prefix, String[] args, boolean brief, PrintWriter categoryPw) { boolean dumpDetails = false;