diff options
3 files changed, 10 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/am/ProcessProfileRecord.java b/services/core/java/com/android/server/am/ProcessProfileRecord.java index e533cc3512d3..47573f31440b 100644 --- a/services/core/java/com/android/server/am/ProcessProfileRecord.java +++ b/services/core/java/com/android/server/am/ProcessProfileRecord.java @@ -607,7 +607,8 @@ final class ProcessProfileRecord { @GuardedBy("mService") void dumpPss(PrintWriter pw, String prefix, long nowUptime) { synchronized (mProfilerLock) { - pw.print(" lastPssTime="); + pw.print(prefix); + pw.print("lastPssTime="); TimeUtils.formatDuration(mLastPssTime, nowUptime, pw); pw.print(" pssProcState="); pw.print(mPssProcState); @@ -629,9 +630,8 @@ final class ProcessProfileRecord { DebugUtils.printSizeValue(pw, mLastRss * 1024); pw.println(); pw.print(prefix); - pw.print(" trimMemoryLevel="); + 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(); } } diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index da8aeb52f3c2..42e7ff4c5724 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -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); diff --git a/services/core/java/com/android/server/am/ProcessStateRecord.java b/services/core/java/com/android/server/am/ProcessStateRecord.java index e1a153dfa920..499fbcb0642d 100644 --- a/services/core/java/com/android/server/am/ProcessStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessStateRecord.java @@ -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); @@ -1316,12 +1316,12 @@ final class ProcessStateRecord { } if (mHasForegroundActivities || mRepForegroundActivities) { pw.print(prefix); - pw.print(" foregroundActivities="); pw.print(mHasForegroundActivities); + pw.print("foregroundActivities="); pw.print(mHasForegroundActivities); pw.print(" (rep="); pw.print(mRepForegroundActivities); pw.println(")"); } if (mSetProcState > ActivityManager.PROCESS_STATE_SERVICE) { pw.print(prefix); - pw.print(" whenUnimportant="); + pw.print("whenUnimportant="); TimeUtils.formatDuration(mWhenUnimportant - nowUptime, pw); pw.println(); } |