Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7788547f authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Android Git Automerger
Browse files

am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3" 

* commit '586b38cc':
  Calculate max_stashed_blocks correctly for block OTA v3
parents 7a1d29eb 586b38cc

tools/releasetools/blockimgdiff.py

+12 −0
Original line number Diff line number Diff line
@@ -396,6 +396,12 @@ class BlockImageDiff(object): 
                xf.style,

                xf.tgt_ranges.to_string_raw(), src_str))

          elif self.version >= 3:

            # take into account automatic stashing of overlapping blocks

            if xf.src_ranges.overlaps(xf.tgt_ranges):

              temp_stash_usage = stashed_blocks + xf.src_ranges.size();

              if temp_stash_usage > max_stashed_blocks:

                max_stashed_blocks = temp_stash_usage



            out.append("%s %s %s %s\n" % (

                xf.style,

                self.HashBlocks(self.tgt, xf.tgt_ranges),
@@ -414,6 +420,12 @@ class BlockImageDiff(object): 
              xf.style, xf.patch_start, xf.patch_len,

              xf.tgt_ranges.to_string_raw(), src_str))

        elif self.version >= 3:

          # take into account automatic stashing of overlapping blocks

          if xf.src_ranges.overlaps(xf.tgt_ranges):

            temp_stash_usage = stashed_blocks + xf.src_ranges.size();

            if temp_stash_usage > max_stashed_blocks:

              max_stashed_blocks = temp_stash_usage



          out.append("%s %d %d %s %s %s %s\n" % (

              xf.style,

              xf.patch_start, xf.patch_len,