commit b369cad4225b08ba9f30c7499200956580d97f4a
author Mathieu Chartier <mathieuc@google.com> Fri Jun 17 11:39:15 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jun 17 11:39:33 2016 -0700
tree 54977d0106438711d16923ffcfcaed4632f1e5f7
parent 592a758c9a710985a3a9a3217002c1e275858bbd

Revert "Revert "Skip DumpForSigQuit if debugger is active""

Bug: 26118154

This reverts commit 539f7fb0964a184b24bf40c729577be76dd7749a.

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index bb91602..caf5545 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1379,6 +1379,11 @@
 }
 
 void Runtime::DumpForSigQuit(std::ostream& os) {
+  // Dumping for SIGQIT may cause deadlocks if the the debugger is active. b/26118154
+  if (Dbg::IsDebuggerActive()) {
+    LOG(INFO) << "Skipping DumpForSigQuit due to active debugger";
+    return;
+  }
   GetClassLinker()->DumpForSigQuit(os);
   GetInternTable()->DumpForSigQuit(os);
   GetJavaVM()->DumpForSigQuit(os);