Merge "Include 'mEarliestFreezableTimeMillis' in the activity dump." into udc-dev

This commit is contained in:
Sudheer Shanka
2023-06-01 16:38:55 +00:00
committed by Android (Google) Code Review
2 changed files with 21 additions and 15 deletions

View File

@@ -18,6 +18,7 @@ package com.android.server.am;
import android.annotation.UptimeMillisLong; import android.annotation.UptimeMillisLong;
import android.app.ActivityManagerInternal.OomAdjReason; import android.app.ActivityManagerInternal.OomAdjReason;
import android.util.TimeUtils;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -320,5 +321,8 @@ final class ProcessCachedOptimizerRecord {
pw.print(prefix); pw.print("isFreezeExempt="); pw.print(mFreezeExempt); pw.print(prefix); pw.print("isFreezeExempt="); pw.print(mFreezeExempt);
pw.print(" isPendingFreeze="); pw.print(mPendingFreeze); pw.print(" isPendingFreeze="); pw.print(mPendingFreeze);
pw.print(" " + IS_FROZEN + "="); pw.println(mFrozen); pw.print(" " + IS_FROZEN + "="); pw.println(mFrozen);
pw.print(prefix); pw.print("earliestFreezableTimeMs=");
TimeUtils.formatDuration(mEarliestFreezableTimeMillis, nowUptime, pw);
pw.println();
} }
} }

View File

@@ -429,6 +429,7 @@ public class UidObserverController {
} }
} }
if (dumpPackage == null) {
pw.println(); pw.println();
pw.print(" mUidChangeDispatchCount="); pw.print(" mUidChangeDispatchCount=");
pw.print(mUidChangeDispatchCount); pw.print(mUidChangeDispatchCount);
@@ -447,6 +448,7 @@ public class UidObserverController {
} }
} }
} }
}
void dumpDebug(@NonNull ProtoOutputStream proto, @Nullable String dumpPackage) { void dumpDebug(@NonNull ProtoOutputStream proto, @Nullable String dumpPackage) {
synchronized (mLock) { synchronized (mLock) {