openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "init: fix last_reboot_reason string" am: 59c74a3bd1 am: 2be5884903 am: 8705f89826 

am: 07ea1a8833

Change-Id: I8a0cacba81809ad93c118d28a3adf8e15514c3c9
This commit is contained in:
Tom Cherry 2017-04-27 20:59:06 +00:00 committed by android-build-merger
parent dac872bb82 07ea1a8833
commit ffc791f045
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/reboot.cpp
View File

@ -423,7 +423,6 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
bool HandlePowerctlMessage(const std::string& command) {
unsigned int cmd = 0;
std::vector<std::string> cmd_params = android::base::Split(command, ",");
std::string reason_string = cmd_params[0];
std::string reboot_target = "";
bool run_fsck = false;
bool command_invalid = false;
@ -436,7 +435,6 @@ bool HandlePowerctlMessage(const std::string& command) {
// The shutdown reason is PowerManager.SHUTDOWN_USER_REQUESTED.
// Run fsck once the file system is remounted in read-only mode.
run_fsck = true;
reason_string = cmd_params[1];
}
} else if (cmd_params[0] == "reboot") {
cmd = ANDROID_RB_RESTART2;
@ -467,6 +465,6 @@ bool HandlePowerctlMessage(const std::string& command) {
return false;
}
DoReboot(cmd, reason_string, reboot_target, run_fsck);
DoReboot(cmd, command, reboot_target, run_fsck);
return true;
}