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

Merge "Error correction: Use block_image_recover in block OTAs"

Browse source
This commit is contained in:
Sami Tolvanen 2015-10-29 16:05:46 +00:00 committed by Gerrit Code Review
commit fe4e86c7fd
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/releasetools/common.py
View file

@ -1284,7 +1284,20 @@ class BlockDifference(object):
else:
ranges = self.src.care_map.subtract(self.src.clobbered_blocks)
ranges_str = ranges.to_string_raw()
if self.version >= 3:
if self.version >= 4:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat") || '
'(block_image_recover("%s", "%s") && '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat"))) then') % (
self.device, ranges_str, self.src.TotalSha1(),
self.device, partition, partition, partition,
self.device, ranges_str,
self.device, partition, partition, partition))
elif self.version == 3:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '