commit 71d9f6f623ca2b56ff471123c036872646d007c4
author Wei Wang <wvw@google.com> Mon Jul 24 22:15:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 24 22:15:20 2017 +0000
tree 996f2c901fad91036c3a489b92294f6d74b33bb6
parent b52815166117b94756b9e9d6cd080126b3bb0ddb
parent 2b444dacf5636b3df661c361a28f5c4a6184df5f

Merge "init: Fire shutdown trigger for thermal shutdown"
am: 603cae8b48

Change-Id: I0bbd26f22887afcf7b2145b78239c9f8e2c45047

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index d096b0d..e4779c7 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -498,10 +498,8 @@
             }
         }
     } 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;
     }