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

Commit 98a6ae31 authored by Wei Wang's avatar Wei Wang Committed by Thierry Strudel
Browse files

init: increase thermal shutdown timeout to 3s 

1) increase thermal shutdown timeout to 3s for process to save work
2) respect property "ro.build.shutdown_timeout" in thermal shutdown if
   it is set less than default time - "3s"

Bug: 112432890
Test: Build
Change-Id: Idc2b24dd44c1fab8f9b047fd2468de2ee45ff783
Merged-In: Idc2b24dd44c1fab8f9b047fd2468de2ee45ff783
(cherry picked from commit b5de0882)
parent c89be177

init/reboot.cpp

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


    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";