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

Commit 835b974e authored by Sami Tolvanen's avatar Sami Tolvanen Committed by android-build-merger
Browse files

Merge "mkbootimg: use int for os_version and os_patch_level" am: adbe06db

am: e4052d2c

* commit 'e4052d2c':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I61c57e45900da7dbdb303565ed5219f19b1e10b1
parents e6975976 e4052d2c
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ def parse_int(x):
def parse_os_version(x):
    match = re.search(r'^(\d{1,3})(?:\.(\d{1,3})(?:\.(\d{1,3}))?)?', x)
    if match:
        a = parse_int(match.group(1))
        a = int(match.group(1))
        b = c = 0
        if match.lastindex >= 2:
            b = parse_int(match.group(2))
            b = int(match.group(2))
        if match.lastindex == 3:
            c = parse_int(match.group(3))
            c = int(match.group(3))
        # 7 bits allocated for each field
        assert a < 128
        assert b < 128
@@ -118,8 +118,8 @@ def parse_os_version(x):
def parse_os_patch_level(x):
    match = re.search(r'^(\d{4})-(\d{2})-(\d{2})', x)
    if match:
        y = parse_int(match.group(1)) - 2000
        m = parse_int(match.group(2))
        y = int(match.group(1)) - 2000
        m = int(match.group(2))
        # 7 bits allocated for the year, 4 bits for the month
        assert y >= 0 and y < 128
        assert m > 0 and m <= 12