Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26cab2b8 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Reduce debuggerd backtrace timeouts in dumpstate" am: ba9df0b0 am:... 

Merge "Reduce debuggerd backtrace timeouts in dumpstate" am: ba9df0b0 am: 3679cafb am: d71e7034 am: c65d2ad2

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



Change-Id: I6effce5c35abf3fbb00acf1a7dc44df00429f2ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c59e4591 c65d2ad2

cmds/dumpstate/dumpstate.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2236,8 +2236,7 @@ Dumpstate::RunStatus Dumpstate::DumpTraces(const char** path) { 


        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