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

Merge "updater: Fix an issue when resuming an update."

Browse Source 
am: 1dc9e2ddef

Change-Id: Iee6d93057ee1c63a35fda2603a5fd5836db83179
This commit is contained in:
Tao Bao
2018-05-07 17:29:00 -07:00
committed by android-build-merger
parent c4ba6b738f 1dc9e2ddef
commit 47bf5e68e6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/blockimg.cpp
+6 -3
View File
@@ -1730,8 +1730,12 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
continue; continue;
} }
// Skip all commands before the saved last command index when resuming an update. std::string cmdname = std::string(params.cmdname);
if (params.canwrite && params.cmdindex != -1 && params.cmdindex <= saved_last_command_index) {
// Skip all commands before the saved last command index when resuming an update, except for
// "new" command. Because new commands read in the data sequentially.
if (params.canwrite && params.cmdindex != -1 && params.cmdindex <= saved_last_command_index &&
cmdname != "new") {
LOG(INFO) << "Skipping already executed command: " << params.cmdindex LOG(INFO) << "Skipping already executed command: " << params.cmdindex
<< ", last executed command for previous update: " << saved_last_command_index; << ", last executed command for previous update: " << saved_last_command_index;
continue; continue;
@@ -1748,7 +1752,6 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
if (!params.canwrite && saved_last_command_index != -1 && params.cmdindex != -1 && if (!params.canwrite && saved_last_command_index != -1 && params.cmdindex != -1 &&
params.cmdindex <= saved_last_command_index) { params.cmdindex <= saved_last_command_index) {
// TODO(xunchang) check that the cmdline of the saved index is correct. // TODO(xunchang) check that the cmdline of the saved index is correct.
std::string cmdname = std::string(params.cmdname);
if ((cmdname == "move" || cmdname == "bsdiff" || cmdname == "imgdiff") && if ((cmdname == "move" || cmdname == "bsdiff" || cmdname == "imgdiff") &&
!params.target_verified) { !params.target_verified) {
LOG(WARNING) << "Previously executed command " << saved_last_command_index << ": " LOG(WARNING) << "Previously executed command " << saved_last_command_index << ": "