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

Commit bfeb9929 authored by Arun S's avatar Arun S
Browse files

Fixed meminfo output format 

- Removed the empty lines which occurs when running the dumpsys meminfo.
- Updated the output format of dumpsys meminfo which was collapsed
  with -S option.
- Print the private dirty in the same line instead of writing it in the
  next line.

Bug: 328410556
Test: verified adb shell dumpsys meminfo [options: -S/-p]
Change-Id: Icd33f005b560da60e957f027a87af5520b8df665
parent 54a8836b

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

+15 −10
Original line number Diff line number Diff line
@@ -12080,18 +12080,23 @@ public class ActivityManagerService extends IActivityManager.Stub 
        for (int i=0; i<items.size(); i++) {

            MemItem mi = items.get(i);

            if (!isCompact) {

                pw.printf("%s%s: %s%s\n", prefix, stringifyKBSize(dumpPss ? mi.pss : mi.mRss),

                            mi.label,

                            mi.userId != UserHandle.USER_SYSTEM ? " (user " + mi.userId + ")" : "");

                if (dumpPss && dumpSwapPss) {

                    pw.printf("(%s in swap%s", stringifyKBSize(mi.swapPss),

                            dumpPrivateDirty ? ", " : ")");

                String printFormat = "%s%s: %s%s\n";

                if ((dumpPss && dumpSwapPss) || dumpPrivateDirty) {

                    StringBuilder format = new StringBuilder();

                    format.append("%s%s: %-60s%s");

                    if (dumpSwapPss) {

                        format.append(String.format("(%s in swap%s", stringifyKBSize(mi.swapPss),

                                dumpPrivateDirty ? ", " : ")"));

                    }

                    if (dumpPrivateDirty) {

                    pw.printf("%s%s private dirty)", dumpSwapPss ? "" : "(",

                            stringifyKBSize(mi.mPrivateDirty));

                        format.append(String.format("%s%s private dirty)", dumpSwapPss ? "" : "(",

                                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) {

                pw.print("proc,"); pw.print(tag); pw.print(","); pw.print(mi.shortLabel);

                pw.print(","); pw.print(mi.id); pw.print(",");