commit 8254b3fb6870cd7193319303a4d4ee510cd9f016
author David Srbecky <dsrbecky@google.com> Mon Sep 26 16:38:45 2022 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 27 21:30:44 2022 +0000
tree 1544ed66629e989a2d0e4f7cec01d772bbba7381
parent 9629277b7b598f9502659b9e79cd0a58899a905d

ANR: Print backtraces before ART information

Prioritize the backtraces if the ANR is trimmed.

Bug: 189881220
Test: Manually trigger ANR and check output.
Change-Id: I1950c43d13e4daa8bbe9b5ac91774110aa2d4762

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index ac2bc54..6bb0049 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -2315,6 +2315,9 @@
 }
 
 void Runtime::DumpForSigQuit(std::ostream& os) {
+  // Print backtraces first since they are important do diagnose ANRs,
+  // and ANRs can often be trimmed to limit upload size.
+  thread_list_->DumpForSigQuit(os);
   GetClassLinker()->DumpForSigQuit(os);
   GetInternTable()->DumpForSigQuit(os);
   GetJavaVM()->DumpForSigQuit(os);
@@ -2330,7 +2333,6 @@
   GetMetrics()->DumpForSigQuit(os);
   os << "\n";
 
-  thread_list_->DumpForSigQuit(os);
   BaseMutex::DumpAll(os);
 
   // Inform anyone else who is interested in SigQuit.