summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-02-28 02:05:39 +0100
committerTianjie Xu <xunchang@google.com>2018-02-28 08:04:14 +0100
commitc2420845391bb8b50cb782c5fee95f0fa643e49c (patch)
tree22de4e9ea21430376e40560b2db9057a040e3335
parentMerge "Set LOCAL_SDK_VERSION where possible." (diff)
downloadandroid_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar.gz
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar.bz2
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar.lz
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar.xz
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.tar.zst
android_bootable_recovery-c2420845391bb8b50cb782c5fee95f0fa643e49c.zip
-rw-r--r--updater/blockimg.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index feb2aeb27..4f085b204 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1727,9 +1727,11 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
const Command* cmd = cmd_map[params.cmdname];
+ // Skip the command if we explicitly set the corresponding function pointer to nullptr, e.g.
+ // "erase" during block_image_verify.
if (cmd->f == nullptr) {
- LOG(ERROR) << "failed to find the function for command [" << line << "]";
- goto pbiudone;
+ LOG(DEBUG) << "skip executing command [" << line << "]";
+ continue;
}
// Skip all commands before the saved last command index when resuming an update.