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

am: b0a6129c43

Change-Id: I3f88302f280809e9df98dc55dd2ca6ebd269e7bb

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