summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-09-30 19:45:35 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-09-30 19:45:35 +0200
commit5269808bb03ba9efdd0bda706472b03ad7ccb061 (patch)
tree98edb6021753eec604eb1105c45b4e8e7fa569a3 /recovery.cpp
parentMerge "Report uncrypt errors in details" (diff)
parentMerge "Turn on -Werror for recovery" (diff)
downloadandroid_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar.gz
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar.bz2
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar.lz
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar.xz
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.tar.zst
android_bootable_recovery-5269808bb03ba9efdd0bda706472b03ad7ccb061.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 91c18b529..12df61db8 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -306,12 +306,12 @@ get_args(int *argc, char ***argv) {
get_bootloader_message(&boot); // this may fail, leaving a zeroed structure
stage = strndup(boot.stage, sizeof(boot.stage));
- if (boot.command[0] != 0 && boot.command[0] != 255) {
+ if (boot.command[0] != 0) {
std::string boot_command = std::string(boot.command, sizeof(boot.command));
LOG(INFO) << "Boot command: " << boot_command;
}
- if (boot.status[0] != 0 && boot.status[0] != 255) {
+ if (boot.status[0] != 0) {
std::string boot_status = std::string(boot.status, sizeof(boot.status));
LOG(INFO) << "Boot status: " << boot_status;
}
@@ -328,7 +328,7 @@ get_args(int *argc, char ***argv) {
(*argv)[*argc] = strdup(arg);
}
LOG(INFO) << "Got arguments from boot message";
- } else if (boot.recovery[0] != 0 && boot.recovery[0] != 255) {
+ } else if (boot.recovery[0] != 0) {
std::string boot_recovery = std::string(boot.recovery, 20);
LOG(ERROR) << "Bad boot message\n" << "\"" <<boot_recovery << "\"";
}