diff options
author | Tao Bao <tbao@google.com> | 2016-12-16 00:15:59 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-16 00:15:59 +0100 |
commit | cb15594696075740b0a7066596caac3acc42d74c (patch) | |
tree | f56eb552981b58a2931abee021bf5c48e62adbfa /recovery.cpp | |
parent | Merge "tests: Add tests for bootloader_message." am: 07d985b75b (diff) | |
parent | Merge "Add update_bootloader_message() to fix two-step OTAs." (diff) | |
download | android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar.gz android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar.bz2 android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar.lz android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar.xz android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.tar.zst android_bootable_recovery-cb15594696075740b0a7066596caac3acc42d74c.zip |
Diffstat (limited to 'recovery.cpp')
-rw-r--r-- | recovery.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/recovery.cpp b/recovery.cpp index 0fdc31cb4..0da3946bb 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -354,20 +354,21 @@ static std::vector<std::string> get_args(const int argc, char** const argv) { // bootloader control block. So the device will always boot into recovery to // finish the pending work, until finish_recovery() is called. std::vector<std::string> options(args.cbegin() + 1, args.cend()); - if (!write_bootloader_message(options, &err)) { - LOG(ERROR) << err; + if (!update_bootloader_message(options, &err)) { + LOG(ERROR) << "Failed to set BCB message: " << err; } return args; } -static void -set_sdcard_update_bootloader_message() { - std::vector<std::string> options; - std::string err; - if (!write_bootloader_message(options, &err)) { - LOG(ERROR) << err; - } +// Set the BCB to reboot back into recovery (it won't resume the install from +// sdcard though). +static void set_sdcard_update_bootloader_message() { + std::vector<std::string> options; + std::string err; + if (!update_bootloader_message(options, &err)) { + LOG(ERROR) << "Failed to set BCB message: " << err; + } } // Read from kernel log into buffer and write out to file. @@ -485,7 +486,7 @@ static void finish_recovery() { // Reset to normal system boot so recovery won't cycle indefinitely. std::string err; if (!clear_bootloader_message(&err)) { - LOG(ERROR) << err; + LOG(ERROR) << "Failed to clear BCB message: " << err; } // Remove the command file, so recovery won't repeat indefinitely. @@ -1323,7 +1324,7 @@ static void set_retry_bootloader_message(int retry_count, int argc, char** argv) // Increment the retry counter by 1. options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count+1)); std::string err; - if (!write_bootloader_message(options, &err)) { + if (!update_bootloader_message(options, &err)) { LOG(ERROR) << err; } } |