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

Check the results from applypatch am: 31f8cc84cf

Browse Source 
am: d0dcbddd31

Change-Id: I00439aae8f79b0e2a5f7de6566110240492b526a
This commit is contained in:
Tianjie Xu
2016-06-16 18:11:47 +00:00
committed by android-build-merger
parent 7676a9cb58 d0dcbddd31
commit 24488eb7db
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
updater/blockimg.cpp
View File

@@ -1264,11 +1264,17 @@ static int PerformCommandDiff(CommandParameters& params) {
}
if (params.cmdname[0] == 'i') { // imgdiff
ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
&RangeSinkWrite, &rss, nullptr, nullptr);
if (ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
&RangeSinkWrite, &rss, nullptr, nullptr) != 0) {
fprintf(stderr, "Failed to apply image patch.\n");
return -1;
}
} else {
ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value, 0,
&RangeSinkWrite, &rss, nullptr);
if (ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
0, &RangeSinkWrite, &rss, nullptr) != 0) {
fprintf(stderr, "Failed to apply bsdiff patch.\n");
return -1;
}
}
// We expect the output of the patcher to fill the tgt ranges exactly.