diff options
Diffstat (limited to 'bootloader_message')
| -rw-r--r-- | bootloader_message/Android.bp | 1 | ||||
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 6 | ||||
| -rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index 778fdb93e..76226773e 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -45,6 +45,7 @@ cc_library { "libbootloader_message_defaults", ], recovery_available: true, + vendor_available: true, host_supported: true, target: { diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index 1ea56cd4e..0a713eed5 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -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)); - 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) { diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index d58158dd6..8fba101a0 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -109,6 +109,7 @@ struct misc_memtag_message { #define MISC_MEMTAG_MODE_MEMTAG_ONCE 0x2 #define MISC_MEMTAG_MODE_MEMTAG_KERNEL 0x4 #define MISC_MEMTAG_MODE_MEMTAG_KERNEL_ONCE 0x8 +#define MISC_MEMTAG_MODE_MEMTAG_OFF 0x10 #if (__STDC_VERSION__ >= 201112L) || defined(__cplusplus) static_assert(sizeof(struct misc_virtual_ab_message) == 64, |