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

2 files changed, 21 insertions, 15 deletions

diff --git a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
index 7841b699ec98..ffe5a6e6b958 100644
--- a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
+++ b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
@@ -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();
     }
 }
diff --git a/services/core/java/com/android/server/am/UidObserverController.java b/services/core/java/com/android/server/am/UidObserverController.java
index a2582083c409..a6677a5185ca 100644
--- a/services/core/java/com/android/server/am/UidObserverController.java
+++ b/services/core/java/com/android/server/am/UidObserverController.java
@@ -429,21 +429,23 @@ public class UidObserverController {
                 }
             }
 
-            pw.println();
-            pw.print("  mUidChangeDispatchCount=");
-            pw.print(mUidChangeDispatchCount);
-            pw.println();
-            pw.println("  Slow UID dispatches:");
-            for (int i = 0; i < count; i++) {
-                final UidObserverRegistration reg = (UidObserverRegistration)
-                        mUidObservers.getRegisteredCallbackCookie(i);
-                pw.print("    ");
-                pw.print(mUidObservers.getRegisteredCallbackItem(i).getClass().getTypeName());
-                pw.print(": ");
-                pw.print(reg.mSlowDispatchCount);
-                pw.print(" / Max ");
-                pw.print(reg.mMaxDispatchTime);
-                pw.println("ms");
+            if (dumpPackage == null) {
+                pw.println();
+                pw.print("  mUidChangeDispatchCount=");
+                pw.print(mUidChangeDispatchCount);
+                pw.println();
+                pw.println("  Slow UID dispatches:");
+                for (int i = 0; i < count; i++) {
+                    final UidObserverRegistration reg = (UidObserverRegistration)
+                            mUidObservers.getRegisteredCallbackCookie(i);
+                    pw.print("    ");
+                    pw.print(mUidObservers.getRegisteredCallbackItem(i).getClass().getTypeName());
+                    pw.print(": ");
+                    pw.print(reg.mSlowDispatchCount);
+                    pw.print(" / Max ");
+                    pw.print(reg.mMaxDispatchTime);
+                    pw.println("ms");
+                }
             }
         }
     }