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

Commit b7acb501 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bump the timeout on IDumpstateDevice" am: 7e42d093 am: 69f39bc1 am:... 

Merge "Bump the timeout on IDumpstateDevice" am: 7e42d093 am: 69f39bc1 am: 5455e4fc am: 70fa373d

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

Change-Id: If1027317160954d1150fa69cf8ce6a4c45566d22
parents b2e29edc 70fa373d

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -2418,7 +2418,7 @@ void Dumpstate::DumpstateBoard(int out_fd) { 
    // Given that bugreport is required to diagnose failures, it's better to set an arbitrary amount

    // Given that bugreport is required to diagnose failures, it's better to set an arbitrary amount

    // of timeout for IDumpstateDevice than to block the rest of bugreport. In the timeout case, we

    // of timeout for IDumpstateDevice than to block the rest of bugreport. In the timeout case, we

    // will kill the HAL and grab whatever it dumped in time.

    // will kill the HAL and grab whatever it dumped in time.

    constexpr size_t timeout_sec = 30;

    constexpr size_t timeout_sec = 45;





    if (dumpstate_hal_handle_aidl != nullptr) {

    if (dumpstate_hal_handle_aidl != nullptr) {

        DoDumpstateBoardAidl(dumpstate_hal_handle_aidl, dumpstate_fds, options_->bugreport_mode,

        DoDumpstateBoardAidl(dumpstate_hal_handle_aidl, dumpstate_fds, options_->bugreport_mode,