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

Commit f54075d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix str/bytes type error in ReplaceOtaKeys" into main

parents 502175c0 0c9a6ffb

tools/releasetools/sign_target_files_apks.py

+2 −2
Original line number Diff line number Diff line
@@ -1131,9 +1131,9 @@ def WriteOtacerts(output_zip, filename, keys): 
  common.ZipWriteStr(output_zip, filename, temp_file.getvalue())





def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):

def ReplaceOtaKeys(input_tf_zip: zipfile.ZipFile, output_tf_zip, misc_info):

  try:

    keylist = input_tf_zip.read("META/otakeys.txt").split()

    keylist = input_tf_zip.read("META/otakeys.txt").decode().split()

  except KeyError:

    raise common.ExternalError("can't read META/otakeys.txt from input")