ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init: fix last_reboot_reason string

Browse source 
This got moved when refactoring the reboot commands.

Bug: 37540660
Test: verify bullhead's last_reboot_reason is correct
Change-Id: I3b86496fc469ca41645df7e7ba8bb51dd25b6b38
(cherry picked from commit 47336cebc3)
This commit is contained in:
Tom Cherry 2017-04-20 16:38:54 -07:00
parent df54d0efc3
commit 704b27bd85
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;
}