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

Commit 86111b1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change dump priority for meminfo - change meminfo dump priority to HIGH... 

Merge "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"
parents 71b4882d 77aab7c0

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

+8 −2
Original line number Diff line number Diff line
@@ -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);

            }

        };