Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include 'mEarliestFreezableTimeMillis' in the activity dump." into udc-dev am: 3f228e2bbb

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

Change-Id: I57e50b720ca06406f2dd72e7b60335b484760521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2023-06-01 16:42:13 +00:00
committed by Automerger Merge Worker
parent c218e8d78c 3f228e2bbb
commit 156cbfc9c5
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
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();
} }
} }

2
services/core/java/com/android/server/am/UidObserverController.java
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) {