summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-09-30 22:34:23 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-09-30 22:34:23 +0200
commit10e223c18100239bfc55c7ceae1744ed84ab9843 (patch)
treed914da4be18ef00a95ba4585e2cec21053db46b4 /recovery.cpp
parentMerge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s ours (diff)
parentTurn on -Werror for recovery (diff)
downloadandroid_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar.gz
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar.bz2
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar.lz
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar.xz
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.tar.zst
android_bootable_recovery-10e223c18100239bfc55c7ceae1744ed84ab9843.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index c7d840dd6..7419bac00 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -318,12 +318,12 @@ get_args(int *argc, char ***argv) {
}
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;
}
@@ -340,7 +340,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 << "\"";
}