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

Change-Id: I1611d973239dd15b01799fc21bdc812dfacc8036
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;
     }