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

Commit 59c74a3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init: fix last_reboot_reason string"

parents 8e0ccc9f 47336ceb
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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;
}