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

Merge "Don't reboot into recovery during userspace reboot"

Browse source
This commit is contained in:
Nikita Ioffe 2020-01-15 22:22:18 +00:00 • committed by Gerrit Code Review
commit 661c77be0f
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
init/builtins.cpp
View file

@ -1119,19 +1119,28 @@ static Result<void> ExecWithFunctionOnFailure(const std::vector<std::string>& ar
} }
static Result<void> ExecVdcRebootOnFailure(const std::string& vdc_arg) { static Result<void> ExecVdcRebootOnFailure(const std::string& vdc_arg) {
bool should_reboot_into_recovery = true;
auto reboot_reason = vdc_arg + "_failed"; auto reboot_reason = vdc_arg + "_failed";
if (android::sysprop::InitProperties::userspace_reboot_in_progress().value_or(false)) {
should_reboot_into_recovery = false;
}
auto reboot = [reboot_reason](const std::string& message) { auto reboot = [reboot_reason, should_reboot_into_recovery](const std::string& message) {
// TODO (b/122850122): support this in gsi // TODO (b/122850122): support this in gsi
if (fscrypt_is_native() && !android::gsi::IsGsiRunning()) { if (should_reboot_into_recovery) {
LOG(ERROR) << message << ": Rebooting into recovery, reason: " << reboot_reason; if (fscrypt_is_native() && !android::gsi::IsGsiRunning()) {
if (auto result = reboot_into_recovery( LOG(ERROR) << message << ": Rebooting into recovery, reason: " << reboot_reason;
{"--prompt_and_wipe_data", "--reason="s + reboot_reason}); if (auto result = reboot_into_recovery(
!result) { {"--prompt_and_wipe_data", "--reason="s + reboot_reason});
LOG(FATAL) << "Could not reboot into recovery: " << result.error(); !result) {
LOG(FATAL) << "Could not reboot into recovery: " << result.error();
}
} else {
LOG(ERROR) << "Failure (reboot suppressed): " << reboot_reason;
} }
} else { } else {
LOG(ERROR) << "Failure (reboot suppressed): " << reboot_reason; LOG(ERROR) << message << ": rebooting, reason: " << reboot_reason;
trigger_shutdown("reboot," + reboot_reason);
} }
}; };