commit 1e0da76374bc4cf5d9974b83b4e6487347663c41
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 28 01:44:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 28 01:44:24 2022 +0000
tree 3412f5fbe704006e18b2c8cce1716b24bc868514
parent 872002acd61a33db920ea16f5c56ea0f1bf584dc
parent cfccc925f6e515d739106b8e464ce69127c0b9c8

Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd am: 50ed6648b1 am: cfccc925f6

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

Change-Id: I8efd8d4c63c6bd5eb4c83d2951c9b7c25ef21804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bootloader_message/bootloader_message.cpp

diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index 1ea56cd..0a713ee 100644
--- a/bootloader_message/bootloader_message.cpp
+++ b/bootloader_message/bootloader_message.cpp
@@ -209,7 +209,11 @@
   memset(boot->command, 0, sizeof(boot->command));
   memset(boot->recovery, 0, sizeof(boot->recovery));
 
-  strlcpy(boot->command, "boot-recovery", sizeof(boot->command));
+  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) {