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

Commit 6a55adc9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "dump stack before kill all" into oc-dr1-dev

parents 74a5f22d 366c51ec

init/reboot.cpp

+3 −3
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, int timeoutMs) { 
    UmountStat stat = UmountPartitions(timeoutMs - t.duration_ms());

    if (stat != UMOUNT_STAT_SUCCESS) {

        LOG(INFO) << "umount timeout, last resort, kill all and try";

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

        KillAllProcesses();

        // even if it succeeds, still it is timeout and do not run fsck with all processes killed

        UmountPartitions(0);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

        UmountStat st = UmountPartitions(0);

        if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

    }



    if (stat == UMOUNT_STAT_SUCCESS && runFsck) {