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

Commit 505a9828 authored by Jing Ji's avatar Jing Ji
Browse files

Fix formatting of the dumpsys activity output 

Bug: 162450085
Test: Manual - dumpsys activity -a
Change-Id: Ife1cd02d7791a4e5518a854042aba3640937c4c7
parent 4858950d

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

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

    @GuardedBy("mService")

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

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

        synchronized (mProfilerLock) {

        synchronized (mProfilerLock) {

            pw.print(prefix);

            pw.print("lastPssTime=");

            pw.print("lastPssTime=");

            TimeUtils.formatDuration(mLastPssTime, nowUptime, pw);

            TimeUtils.formatDuration(mLastPssTime, nowUptime, pw);

            pw.print(" pssProcState=");

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

            pw.print(prefix);

            pw.print("trimMemoryLevel=");

            pw.print("trimMemoryLevel=");

            pw.println(mTrimMemoryLevel);

            pw.println(mTrimMemoryLevel);

            pw.println();

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

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

            mProcStateMemTracker.dumpLine(pw);

            mProcStateMemTracker.dumpLine(pw);

            pw.print(prefix);

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

            pw.print(" timeUsed=");

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

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

        }

        }

        pw.println();

    }

    }

}
 
}

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

+2 −1
Original line number Original line 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("mInstr="); pw.println(mInstr);

        }

        }

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

        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=");

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

        TimeUtils.formatDuration(mLastActivityTime, nowUptime, pw);

        TimeUtils.formatDuration(mLastActivityTime, nowUptime, pw);

        pw.println();

        if (mPersistent || mRemoved) {

        if (mPersistent || mRemoved) {

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

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

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

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

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

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

        pw.print(" set="); pw.println(mSetAdj);

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

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

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

        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(prefix); pw.print("curProcState="); pw.print(getCurProcState());

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

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

        pw.print(" setProcState="); pw.print(mSetProcState);

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

        }

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

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

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

            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(prefix); pw.print("cached="); pw.print(mCached);

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

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