tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "recovery: do not update bootloader message for boot-fastboot" into main am: 3bf54b57d2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027544

Change-Id: Idfc15f3c2e1dc5b398f9056c644564ad8fcc20bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roy Luo 2024-04-08 18:39:16 +00:00 committed by Automerger Merge Worker
commit 3e55030b34
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
recovery_main.cpp
View file

@ -155,9 +155,13 @@ static std::vector<std::string> get_args(const int argc, char** const argv, std:
// Write the arguments (excluding the filename in args[0]) back into the
// bootloader control block. So the device will always boot into recovery to
// finish the pending work, until FinishRecovery() is called.
std::vector<std::string> options(args.cbegin() + 1, args.cend());
if (!update_bootloader_message(options, &err)) {
LOG(ERROR) << "Failed to set BCB message: " << err;
// This should only be done for boot-recovery command so that other commands
// won't be overwritten.
if (boot_command == "boot-recovery") {
std::vector<std::string> options(args.cbegin() + 1, args.cend());
if (!update_bootloader_message(options, &err)) {
LOG(ERROR) << "Failed to set BCB message: " << err;
}
}
// Finally, if no arguments were specified, check whether we should boot