commit 00e1f0033eede8f23ff72097c98b7fd70a4e349d
author Sami Tolvanen <samitolvanen@google.com> Sat Apr 25 08:00:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 25 08:00:03 2015 +0000
tree 9c7e0589192d27288e1c6967f377384d63d07396
parent f3a6b07b80a32b822f63cb1d34de64e8395484a8
parent e09d096ed6015a4e3d24591ce588ecf8fd66b494

Merge "Check partition hash before resorting to block_image_verify"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 6a5d22f..a8b0035 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1140,10 +1140,13 @@
       script.Print("Image %s will be patched unconditionally." % (partition,))
     else:
       if self.version >= 3:
-        script.AppendExtra(('if block_image_verify("%s", '
+        script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
+                            'block_image_verify("%s", '
                             'package_extract_file("%s.transfer.list"), '
-                            '"%s.new.dat", "%s.patch.dat") then') %
-                           (self.device, partition, partition, partition))
+                            '"%s.new.dat", "%s.patch.dat")) then') % (
+                            self.device, self.src.care_map.to_string_raw(),
+                            self.src.TotalSha1(),
+                            self.device, partition, partition, partition))
       else:
         script.AppendExtra('if range_sha1("%s", "%s") == "%s" then' % (
             self.device, self.src.care_map.to_string_raw(),