summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-14 06:53:31 +0100
committerTao Bao <tbao@google.com>2016-12-15 21:36:26 +0100
commit2292db819bacc74a38334dc7da543856ac14de4e (patch)
tree92da6e8d0b0d4a799a8849d99c17a10b108378f6 /recovery.cpp
parentMerge "tests: Add tests for bootloader_message." (diff)
downloadandroid_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar.gz
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar.bz2
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar.lz
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar.xz
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.tar.zst
android_bootable_recovery-2292db819bacc74a38334dc7da543856ac14de4e.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp23
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;
}
}