PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up bootloader_message usage in recovery" am: 94f4494613

Browse Source 
am: 7691800c2e

Change-Id: I4ef47383d9da3a6aef72fdb689e2aa2cfbeeb963
This commit is contained in:
Tianjie Xu
2016-10-19 03:02:41 +00:00
committed by android-build-merger
parent 502e34c301 7691800c2e
commit 0ddd07b0bd
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+12 -28
View File
@@ -372,25 +372,20 @@ get_args(int *argc, char ***argv) {
// --> write the arguments we have back into the bootloader control block // --> write the arguments we have back into the bootloader control block
// always boot into recovery after this (until finish_recovery() is called) // always boot into recovery after this (until finish_recovery() is called)
strlcpy(boot.command, "boot-recovery", sizeof(boot.command)); std::vector<std::string> options;
strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery)); for (int i = 1; i < *argc; ++i) {
int i; options.push_back((*argv)[i]);
for (i = 1; i < *argc; ++i) {
strlcat(boot.recovery, (*argv)[i], sizeof(boot.recovery));
strlcat(boot.recovery, "\n", sizeof(boot.recovery));
} }
if (!write_bootloader_message(boot, &err)) { if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err; LOG(ERROR) << err;
} }
} }
static void static void
set_sdcard_update_bootloader_message() { set_sdcard_update_bootloader_message() {
bootloader_message boot = {}; std::vector<std::string> options;
strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
std::string err; std::string err;
if (!write_bootloader_message(boot, &err)) { if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err; LOG(ERROR) << err;
} }
} }
@@ -543,9 +538,8 @@ finish_recovery() {
copy_logs(); copy_logs();
// Reset to normal system boot so recovery won't cycle indefinitely. // Reset to normal system boot so recovery won't cycle indefinitely.
bootloader_message boot = {};
std::string err; std::string err;
if (!write_bootloader_message(boot, &err)) { if (!clear_bootloader_message(&err)) {
LOG(ERROR) << err; LOG(ERROR) << err;
} }
@@ -1392,27 +1386,17 @@ static bool is_battery_ok() {
} }
static void set_retry_bootloader_message(int retry_count, int argc, char** argv) { static void set_retry_bootloader_message(int retry_count, int argc, char** argv) {
bootloader_message boot = {}; std::vector<std::string> options;
strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (strstr(argv[i], "retry_count") == nullptr) { if (strstr(argv[i], "retry_count") == nullptr) {
strlcat(boot.recovery, argv[i], sizeof(boot.recovery)); options.push_back(argv[i]);
strlcat(boot.recovery, "\n", sizeof(boot.recovery));
} }
} }
// Initialize counter to 1 if it's not in BCB, otherwise increment it by 1. // Increment the retry counter by 1.
if (retry_count == 0) { options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count+1));
strlcat(boot.recovery, "--retry_count=1\n", sizeof(boot.recovery));
} else {
char buffer[20];
snprintf(buffer, sizeof(buffer), "--retry_count=%d\n", retry_count+1);
strlcat(boot.recovery, buffer, sizeof(boot.recovery));
}
std::string err; std::string err;
if (!write_bootloader_message(boot, &err)) { if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err; LOG(ERROR) << err;
} }
} }