tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix the behavior of undefined commands in BlockImageVerify"

Browse source 
am: ac4818d6af

Change-Id: I5e42bcafca4c42e6c30cef082c03ad2b8d18ac6c
This commit is contained in:
Tianjie Xu 2018-02-28 18:59:33 +00:00 committed by android-build-merger
commit 7b9a92c1e2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
updater/blockimg.cpp
View file

@ -1727,9 +1727,11 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
const Command* cmd = cmd_map[params.cmdname]; 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) { if (cmd->f == nullptr) {
LOG(ERROR) << "failed to find the function for command [" << line << "]"; LOG(DEBUG) << "skip executing command [" << line << "]";
goto pbiudone; continue;
} }
// Skip all commands before the saved last command index when resuming an update. // Skip all commands before the saved last command index when resuming an update.