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

Merge "Fix dumpsys meminfo -c output." into nyc-dev

Browse Source 
am: c61e102474

* commit 'c61e102474c1fe0e16503856531106f8bff9e36b':
  Fix dumpsys meminfo -c output.
This commit is contained in:
Martijn Coenen
2016-02-09 13:37:29 +00:00
committed by android-build-merger
parent 37b8458935 c61e102474
commit f568f547d8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;