commit 0c9a6ffb002857fa2d6cd551c2f308f70365a4a6
author Kelvin Zhang <zhangkelvin@google.com> Wed Sep 04 17:03:24 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Wed Sep 04 17:03:24 2024 -0700
tree 0511d8cafa981da46f7c5d241e3a1d5ffbe2fb88
parent 5fcaa1f635ca9bb6ba9f1c68391325bb4217d0cb

Fix str/bytes type error in ReplaceOtaKeys

ZipFile.read() returns byte sequence, while re.match expects str.
Decode the bytes read first.

Test: th
Bug: 315855025
Change-Id: Id2da071f3caeab56cfac845a9e4f842c4e102f49

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 9573148..96e9a32 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1156,9 +1156,9 @@
   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")