commit 30f04a76aca09a17a198bf082adfc4c63633ad58
author Simon MacMullen <simonmacm@google.com> Wed Feb 05 10:57:40 2020 +0000
committer Simon MacMullen <simonmacm@google.com> Thu Feb 20 16:01:32 2020 +0000
tree 88eb54784dd5038d47bdead5f8d32af612994bb7
parent 46755e27c90c9e44b4f6e0e30e187738985f4343

Add memory pressure information to ANR and system server watchdog.

Bug: 146039257
Test: Manually triggered ANR and inspected report.
Change-Id: Ib32f9bca0de6e04455413addab750c7225a0fe73

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

diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 86df794..c2f03ec 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -66,6 +66,7 @@
 import com.android.internal.os.ProcessCpuTracker;
 import com.android.internal.os.Zygote;
 import com.android.internal.util.FrameworkStatsLog;
+import com.android.server.MemoryPressureUtil;
 import com.android.server.wm.WindowProcessController;
 import com.android.server.wm.WindowProcessListener;
 
@@ -1582,6 +1583,8 @@
             info.append("Parent: ").append(parentShortComponentName).append("\n");
         }
 
+        StringBuilder report = new StringBuilder();
+        report.append(MemoryPressureUtil.currentPsiState());
         ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true);
 
         // don't dump native PIDs for background ANRs unless it is the process of interest
@@ -1614,7 +1617,6 @@
                 (isSilentAnr()) ? null : processCpuTracker, (isSilentAnr()) ? null : lastPids,
                 nativePids, tracesFileException);
 
-        StringBuilder report = new StringBuilder();
         if (isMonitorCpuUsage()) {
             mService.updateCpuStatsNow();
             synchronized (mService.mProcessCpuTracker) {