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

Commit ed6f596d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init: increase thermal shutdown timeout to 3s"

parents e2015afd b5de0882

init/reboot.cpp

+7 −8
Original line number Diff line number Diff line
@@ -307,15 +307,14 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str 


    auto shutdown_timeout = 0ms;

    if (!SHUTDOWN_ZERO_TIMEOUT) {

        if (is_thermal_shutdown) {

            constexpr unsigned int thermal_shutdown_timeout = 1;

            shutdown_timeout = std::chrono::seconds(thermal_shutdown_timeout);

        } else {

        constexpr unsigned int shutdown_timeout_default = 6;

            auto shutdown_timeout_property = android::base::GetUintProperty(

                "ro.build.shutdown_timeout", shutdown_timeout_default);

            shutdown_timeout = std::chrono::seconds(shutdown_timeout_property);

        constexpr unsigned int max_thermal_shutdown_timeout = 3;

        auto shutdown_timeout_final = android::base::GetUintProperty("ro.build.shutdown_timeout",

                                                                     shutdown_timeout_default);

        if (is_thermal_shutdown && shutdown_timeout_final > max_thermal_shutdown_timeout) {

            shutdown_timeout_final = max_thermal_shutdown_timeout;

        }

        shutdown_timeout = std::chrono::seconds(shutdown_timeout_final);

    }

    LOG(INFO) << "Shutdown timeout: " << shutdown_timeout.count() << " ms";