commit 00368d597844b2c66b3f2a570dbd9c675e4888e6
author Wei Wang <wvw@google.com> Mon Jul 24 22:27:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 24 22:27:50 2017 +0000
tree 5055d35eff6654f2c2c71dc8b73962a76a7d0670
parent 2f23c38f16fc647e0e5ae0538181fbf934d5459c
parent 6589a822131cc14356d7429e38df250d30d7515c

Merge "init: Fire shutdown trigger for thermal shutdown" am: 603cae8b48 am: b0a6129c43 am: fc2f0a0ce7
am: 9a63ee349d

Change-Id: I6e44b248c79a7472bea4557fc55bbf79733ecd14

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