Merge "Fixed meminfo output format" into main (72514ec3) · Commits · e / os / android_frameworks_base

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

+15 −10

Original line number	Original line	Diff line number	Diff line
	@@ -12084,18 +12084,23 @@ public class ActivityManagerService extends IActivityManager.Stub
	for (int i=0; i<items.size(); i++) {		for (int i=0; i<items.size(); i++) {
	MemItem mi = items.get(i);		MemItem mi = items.get(i);
	if (!isCompact) {		if (!isCompact) {
	pw.printf("%s%s: %s%s\n", prefix, stringifyKBSize(dumpPss ? mi.pss : mi.mRss),		String printFormat = "%s%s: %s%s\n";
	mi.label,		if ((dumpPss && dumpSwapPss) \|\| dumpPrivateDirty) {
	mi.userId != UserHandle.USER_SYSTEM ? " (user " + mi.userId + ")" : "");		StringBuilder format = new StringBuilder();
	if (dumpPss && dumpSwapPss) {		format.append("%s%s: %-60s%s");
	pw.printf("(%s in swap%s", stringifyKBSize(mi.swapPss),		if (dumpSwapPss) {
	dumpPrivateDirty ? ", " : ")");		format.append(String.format("(%s in swap%s", stringifyKBSize(mi.swapPss),
			dumpPrivateDirty ? ", " : ")"));
	}		}
	if (dumpPrivateDirty) {		if (dumpPrivateDirty) {
	pw.printf("%s%s private dirty)", dumpSwapPss ? "" : "(",		format.append(String.format("%s%s private dirty)", dumpSwapPss ? "" : "(",
	stringifyKBSize(mi.mPrivateDirty));		stringifyKBSize(mi.mPrivateDirty)));
	}		}
	pw.printf("\n");		printFormat = format.append("\n").toString();
			}
			pw.printf(printFormat, prefix, stringifyKBSize(dumpPss ? mi.pss : mi.mRss),
			mi.label,
			mi.userId != UserHandle.USER_SYSTEM ? " (user " + mi.userId + ")" : "");
	} else if (mi.isProc) {		} else if (mi.isProc) {
	pw.print("proc,"); pw.print(tag); pw.print(","); pw.print(mi.shortLabel);		pw.print("proc,"); pw.print(tag); pw.print(","); pw.print(mi.shortLabel);
	pw.print(","); pw.print(mi.id); pw.print(",");		pw.print(","); pw.print(mi.id); pw.print(",");