commit cddcc0d9cf7cbba53e54d67455737a3900ae5d9f
author android-build-team Robot <android-build-team-robot@google.com> Wed Nov 07 04:01:11 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Nov 07 04:01:11 2018 +0000
tree 37efdc7e0a7a4f8b4bf7e8669ff468c0fe360895
parent 79f5407b4d69160f044785ae1dceef18e2775a72
parent b94cc009432f0b1c0e7b18ce3812580a56ff8d0f

Snap for 5115288 from b94cc009432f0b1c0e7b18ce3812580a56ff8d0f to pi-qpr2-release

Change-Id: I4709055bf47574f71518182ca184b1dd9443828b

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 328164f..503afdd 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -350,15 +350,14 @@
 
     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 shutdown_timeout_default = 6;
+        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";