commit c65d2ad2925bb46552865fba59521cb5d475e959
author Kevin Jeon <kevinjeon@google.com> Wed Apr 05 21:05:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 05 21:05:00 2023 +0000
tree 31670aa41ef7cdf6708315398838190592ad9a67
parent 88968f717b27c5150595e496f5473497f25a6353
parent d71e7034e4e6cdc530fb07eab1bd8869df935ba7

Merge "Reduce debuggerd backtrace timeouts in dumpstate" am: ba9df0b0de am: 3679cafbfd am: d71e7034e4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2522998

Change-Id: Ic9450c0ecfc2e30671714f93c9c17ca1e27f6efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 40683ed..043a7f1 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2236,8 +2236,7 @@
 
         const uint64_t start = Nanotime();
         const int ret = dump_backtrace_to_file_timeout(
-            pid, is_java_process ? kDebuggerdJavaBacktrace : kDebuggerdNativeBacktrace,
-            is_java_process ? 5 : 20, fd);
+            pid, is_java_process ? kDebuggerdJavaBacktrace : kDebuggerdNativeBacktrace, 3, fd);
 
         if (ret == -1) {
             // For consistency, the header and footer to this message match those