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

Commit fa666304 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Include 'mEarliestFreezableTimeMillis' in the activity dump." into... 

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

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



Change-Id: Icf34cc6a06dd205b1ae3a0367319386cac971cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35a7b997 fd8eb08e

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

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.am; 


import android.annotation.UptimeMillisLong;

import android.app.ActivityManagerInternal.OomAdjReason;

import android.util.TimeUtils;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;
@@ -320,5 +321,8 @@ final class ProcessCachedOptimizerRecord { 
        pw.print(prefix); pw.print("isFreezeExempt="); pw.print(mFreezeExempt);

        pw.print(" isPendingFreeze="); pw.print(mPendingFreeze);

        pw.print(" " + IS_FROZEN + "="); pw.println(mFrozen);

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

        TimeUtils.formatDuration(mEarliestFreezableTimeMillis, nowUptime, pw);

        pw.println();

    }

}

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

+17 −15
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ public class UidObserverController { 
                }

            }



            if (dumpPackage == null) {

                pw.println();

                pw.print("  mUidChangeDispatchCount=");

                pw.print(mUidChangeDispatchCount);
@@ -447,6 +448,7 @@ public class UidObserverController { 
                }

            }

        }

    }



    void dumpDebug(@NonNull ProtoOutputStream proto, @Nullable String dumpPackage) {

        synchronized (mLock) {