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

Commit 3f228e2b authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

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

parents 049923ce a3531f1d

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) {