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

Commit d5c75d0c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix formatting of the dumpsys activity output" into sc-dev am: 99e8b60b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13564390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9c62ce7cbaf0072031c3499a9f7dc844a0686cf
parents c09f4ac2 99e8b60b

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

+4 −3
Original line number Diff line number Diff line
@@ -607,6 +607,7 @@ final class ProcessProfileRecord { 
    @GuardedBy("mService")

    void dumpPss(PrintWriter pw, String prefix, long nowUptime) {

        synchronized (mProfilerLock) {

            pw.print(prefix);

            pw.print("lastPssTime=");

            TimeUtils.formatDuration(mLastPssTime, nowUptime, pw);

            pw.print(" pssProcState=");
@@ -631,7 +632,6 @@ final class ProcessProfileRecord { 
            pw.print(prefix);

            pw.print("trimMemoryLevel=");

            pw.println(mTrimMemoryLevel);

            pw.println();

            pw.print(prefix); pw.print("procStateMemTracker: ");

            mProcStateMemTracker.dumpLine(pw);

            pw.print(prefix);
@@ -653,5 +653,6 @@ final class ProcessProfileRecord { 
            pw.print(" timeUsed=");

            TimeUtils.formatDuration(mCurCpuTime.get() - lastCpuTime, pw);

        }

        pw.println();

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -425,9 +425,10 @@ class ProcessRecord implements WindowProcessListener { 
            pw.print(prefix); pw.print("mInstr="); pw.println(mInstr);

        }

        pw.print(prefix); pw.print("thread="); pw.println(mThread);

        pw.print(prefix); pw.print("pid="); pw.print(mPid);

        pw.print(prefix); pw.print("pid="); pw.println(mPid);

        pw.print(prefix); pw.print("lastActivityTime=");

        TimeUtils.formatDuration(mLastActivityTime, nowUptime, pw);

        pw.println();

        if (mPersistent || mRemoved) {

            pw.print(prefix); pw.print("persistent="); pw.print(mPersistent);

            pw.print(" removed="); pw.println(mRemoved);

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

+4 −4
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ final class ProcessStateRecord { 
        pw.print(" set="); pw.println(mSetAdj);

        pw.print(prefix); pw.print("mCurSchedGroup="); pw.print(mCurSchedGroup);

        pw.print(" setSchedGroup="); pw.print(mSetSchedGroup);

        pw.print(" systemNoUi="); pw.print(mSystemNoUi);

        pw.print(" systemNoUi="); pw.println(mSystemNoUi);

        pw.print(prefix); pw.print("curProcState="); pw.print(getCurProcState());

        pw.print(" mRepProcState="); pw.print(mRepProcState);

        pw.print(" setProcState="); pw.print(mSetProcState);
@@ -1297,7 +1297,7 @@ final class ProcessStateRecord { 
        }

        if (mHasShownUi || mApp.mProfile.hasPendingUiClean()) {

            pw.print(prefix); pw.print("hasShownUi="); pw.print(mHasShownUi);

            pw.print(" pendingUiClean="); pw.print(mApp.mProfile.hasPendingUiClean());

            pw.print(" pendingUiClean="); pw.println(mApp.mProfile.hasPendingUiClean());

        }

        pw.print(prefix); pw.print("cached="); pw.print(mCached);

        pw.print(" empty="); pw.println(mEmpty);