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

Commit 7e31f421 authored by Tao Bao's avatar Tao Bao
Browse files

write_bootloader_message(<options>) should not reset stage field. 

Commit bd56f159 switches to calling
write_bootloader_message(<options>) in get_args(), which
unintentionally resets the stage field thus breaks two-step OTAs.

This CL changes write_bootloader_message(<options>) to only set the
command field (to "boot-recovery") and the recovery field (with the
specified options).

Test: Apply a two-step package.
Change-Id: I6905918812c7d3402cc1524688079066a4d22d29
parent 3aadbbac

bootloader_message/bootloader_message.cpp

+7 −1
Original line number Diff line number Diff line
@@ -164,7 +164,13 @@ bool clear_bootloader_message(std::string* err) { 
}



bool write_bootloader_message(const std::vector<std::string>& options, std::string* err) {

  bootloader_message boot = {};

  bootloader_message boot;

  if (!read_bootloader_message(&boot, err)) {

    return false;

  }

  // Zero out the entire fields.

  memset(boot.command, 0, sizeof(boot.command));

  memset(boot.recovery, 0, sizeof(boot.recovery));

  strlcpy(boot.command, "boot-recovery", sizeof(boot.command));

  strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));

  for (const auto& s : options) {

bootloader_message/include/bootloader_message/bootloader_message.h

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ bool write_bootloader_message(const bootloader_message& boot, std::string* err); 
bool write_bootloader_message_to(const bootloader_message& boot,

                                 const std::string& misc_blk_device, std::string* err);



// Write bootloader message (boots into recovery with the options) to BCB.

// Write bootloader message (boots into recovery with the options) to BCB. Will

// set command and recovery fields only.

bool write_bootloader_message(const std::vector<std::string>& options, std::string* err);



// Clear BCB.