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

Commit 4e24aa2b authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "dump stack before kill all" 

am: c13a2da2

Change-Id: Ie09fd8a7e95686c41d2a7af9e9e291f89c673036
parents b945cc6d c13a2da2

init/reboot.cpp

+3 −3
Original line number Diff line number Diff line
@@ -323,11 +323,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, std::chrono::milliseconds timeo 
    UmountStat stat = UmountPartitions(timeout - t.duration());

    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(0ms);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

        UmountStat st = UmountPartitions(0ms);

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

    }



    if (stat == UMOUNT_STAT_SUCCESS && runFsck) {