Merge "Add the system uptime to crash dumps to better understand crashes happening after reboots." into main
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f92af67..b2a7948 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -9367,6 +9367,8 @@
*/
void appendDropBoxProcessHeaders(ProcessRecord process, String processName,
final VolatileDropboxEntryStates volatileStates, final StringBuilder sb) {
+ sb.append("SystemUptimeMs: ").append(SystemClock.uptimeMillis()).append("\n");
+
// Watchdog thread ends up invoking this function (with
// a null ProcessRecord) to add the stack file to dropbox.
// Do not acquire a lock on this (am) in such cases, as it