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

Commit f91503bd authored by Jooyung Han's avatar Jooyung Han
Browse files

Clean up userspace-reboot (#2) 

Bug: 292469129
Test: CtsInitTestCases
Test: system/core/bootstat/boot_reason_test.sh
Change-Id: I00deb50c5634ade6b69d5b6bf4d08c5101e0beb8
parent e34549af

init/builtins.cpp

+8 −18
Original line number Diff line number Diff line
@@ -1137,16 +1137,10 @@ static Result<void> ExecWithFunctionOnFailure(const std::vector<std::string>& ar 
}



static Result<void> ExecVdcRebootOnFailure(const std::string& vdc_arg) {

    bool should_reboot_into_recovery = true;

    auto reboot_reason = vdc_arg + "_failed";

    if (android::sysprop::InitProperties::userspace_reboot_in_progress().value_or(false)) {

        should_reboot_into_recovery = false;

        reboot_reason = "userspace_failed," + vdc_arg;

    }



    auto reboot = [reboot_reason, should_reboot_into_recovery](const std::string& message) {

    auto reboot = [reboot_reason](const std::string& message) {

        // TODO (b/122850122): support this in gsi

        if (should_reboot_into_recovery) {

        if (IsFbeEnabled() && !android::gsi::IsGsiRunning()) {

            LOG(ERROR) << message << ": Rebooting into recovery, reason: " << reboot_reason;

            if (auto result = reboot_into_recovery(
@@ -1157,10 +1151,6 @@ static Result<void> ExecVdcRebootOnFailure(const std::string& vdc_arg) { 
        } else {

            LOG(ERROR) << "Failure (reboot suppressed): " << reboot_reason;

        }

        } else {

            LOG(ERROR) << message << ": rebooting, reason: " << reboot_reason;

            trigger_shutdown("reboot," + reboot_reason);

        }

    };



    std::vector<std::string> args = {"exec", "/system/bin/vdc", "--wait", "cryptfs", vdc_arg};