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

Commit 95d43b9f authored by Roy Luo's avatar Roy Luo Committed by Automerger Merge Worker
Browse files

Merge "recovery: do not update bootloader message for boot-fastboot" into main... 

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

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



Change-Id: I94d645bab06dc87562db6fe9a368564479db1214
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63e31280 3e55030b

recovery_main.cpp

+7 −3
Original line number Diff line number Diff line
@@ -155,10 +155,14 @@ 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.

  // 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

  // into fastboot or rescue mode.