summaryrefslogtreecommitdiffstats
path: root/bootloader_message/bootloader_message.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-16 00:32:24 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-16 00:32:24 +0100
commit5c13ade64c99d4483e088c8f3aa9bfed63ef6d64 (patch)
treef56eb552981b58a2931abee021bf5c48e62adbfa /bootloader_message/bootloader_message.cpp
parentMerge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec (diff)
parentMerge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 (diff)
downloadandroid_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar.gz
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar.bz2
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar.lz
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar.xz
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.tar.zst
android_bootable_recovery-5c13ade64c99d4483e088c8f3aa9bfed63ef6d64.zip
Diffstat (limited to 'bootloader_message/bootloader_message.cpp')
-rw-r--r--bootloader_message/bootloader_message.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index 9a5671843..b873d3dc3 100644
--- a/bootloader_message/bootloader_message.cpp
+++ b/bootloader_message/bootloader_message.cpp
@@ -176,6 +176,27 @@ bool write_bootloader_message(const std::vector<std::string>& options, std::stri
return write_bootloader_message(boot, err);
}
+bool update_bootloader_message(const std::vector<std::string>& options, std::string* err) {
+ 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) {
+ strlcat(boot.recovery, s.c_str(), sizeof(boot.recovery));
+ if (s.back() != '\n') {
+ strlcat(boot.recovery, "\n", sizeof(boot.recovery));
+ }
+ }
+ return write_bootloader_message(boot, err);
+}
+
bool write_reboot_bootloader(std::string* err) {
bootloader_message boot;
if (!read_bootloader_message(&boot, err)) {