From 1be2212319d1e74357a07aa2c98e5782dbf7997a Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 24 Jul 2017 13:08:41 -0700 Subject: [PATCH] init: Fire shutdown trigger for thermal shutdown Recent change in init has bring normal shutdown sequence in thermal-shutdown condition. This CL will make sure init fire shutdown trigger where holds custom shutdown actions for vendor SoC/platform. Bug: 63686426 Test: adb shell setprop sys.powerctl thermal-shutdown Change-Id: Ieb8579fdf9c30c1a81d60466a7375c9784f3ca98 --- init/reboot.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init/reboot.cpp b/init/reboot.cpp index d096b0dd8..e4779c7e2 100644 --- a/init/reboot.cpp +++ b/init/reboot.cpp @@ -498,10 +498,8 @@ bool HandlePowerctlMessage(const std::string& command) { } } } else if (command == "thermal-shutdown") { // no additional parameter allowed + // run_fsck is false to avoid delay cmd = ANDROID_RB_THERMOFF; - // Do not queue "shutdown" trigger since we want to shutdown immediately - DoReboot(cmd, command, reboot_target, run_fsck); - return true; } else { command_invalid = true; }