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

Commit 8787cd6d authored by Tao Bao's avatar Tao Bao
Browse files

resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev 

Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
parents 78d1cba0 7f9470cd

tools/releasetools/sparse_img.py

+6 −2
Original line number Diff line number Diff line
@@ -201,7 +201,11 @@ class SparseImage(object): 
          nonzero_blocks.append(b)

          nonzero_blocks.append(b+1)



    assert zero_blocks or nonzero_blocks



    if zero_blocks:

      out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)

    if nonzero_blocks:

      out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)



  def ResetFileMap(self):