Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47336ceb authored by Tom Cherry's avatar Tom Cherry
Browse files

init: fix last_reboot_reason string 

This got moved when refactoring the reboot commands.

Bug: 37540660
Test: verify bullhead's last_reboot_reason is correct
Change-Id: I3b86496fc469ca41645df7e7ba8bb51dd25b6b38
parent 8c437b95

init/reboot.cpp

+1 −3
Original line number Diff line number Diff line
@@ -429,7 +429,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;
@@ -442,7 +441,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;
@@ -473,6 +471,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;

}