commit fe5a094503f9206a5c43adc358afe11092677eba
author Andreas Gampe <agampe@google.com> Fri Jun 23 06:02:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 06:02:04 2017 +0000
tree 4fc7470f7d2f79f8ecd6748c3c42926c929f15ca
parent d9dc73a1ac9e4e39f9da5d19277d17f6c1c1bdee
parent fbebd277412d18c3fe6a99dbf56a23cb59755625

Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" am: b2bf7a5330 am: 21ca4e5d4a am: 7dfcc376f7
am: 11c8647ecd

Change-Id: I904d85dd273d20288073b792c22dd6b6ebb7772d

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;