commit 50ed6648b1f4404bf71a546bc2a75ab0a8649dc0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 28 00:17:19 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 28 00:17:19 2022 +0000
tree 3412f5fbe704006e18b2c8cce1716b24bc868514
parent 581fd1501bf2c9719372593ba1dd0852b7ccf4f1
parent 859ebabebd0fc4e7c9e6079aab5fdc8fe536683c

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

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

Change-Id: Ie993d5a357e77928d0a2dd5ea5ae5198c03a17b7
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) {