commit 7dfcc376f7b389cb5bd064f206d32b44a6335b55
author Andreas Gampe <agampe@google.com> Fri Jun 23 05:43:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 05:43:31 2017 +0000
tree 791e43df68513229cfceedf76e1048154a7e8e1e
parent 067e0f0d8552a4cc06a7d27ad8350f4f3fc46751
parent 21ca4e5d4a19499d9668bf9ab81d4f876ff22764

Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" am: b2bf7a5330
am: 21ca4e5d4a

Change-Id: I2b178cfb2d44bafa0759c1aa2fd510e93b39959a

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index df7201d..4b1e51d 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -282,7 +282,10 @@
   ATRACE_NAME("after reparent");
 
   // Die if we take too long.
-  alarm(2);
+  //
+  // Note: processes with many threads and minidebug-info can take a bit to
+  //       unwind, do not make this too small. b/62828735
+  alarm(5);
 
   std::string attach_error;