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

Commit 1e0da763 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix doing silent update,power cut/restoration,screen is turned on" am:... 

Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb7 am: 859ebabe am: 50ed6648 am: cfccc925

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



Change-Id: I8efd8d4c63c6bd5eb4c83d2951c9b7c25ef21804
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 872002ac cfccc925

bootloader_message/bootloader_message.cpp

+5 −1
Original line number Diff line number Diff line
@@ -209,7 +209,11 @@ bool update_bootloader_message_in_struct(bootloader_message* boot, 
  memset(boot->command, 0, sizeof(boot->command));

  memset(boot->recovery, 0, sizeof(boot->recovery));



  if (android::base::GetBoolProperty("ro.boot.quiescent", false)) {

    strlcpy(boot->command, "boot-recovery,quiescent", sizeof(boot->command));

  } else {

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

  }



  std::string recovery = "recovery\n";

  for (const auto& s : options) {