commit f54075d5d4bfaf7605c7b1b33818db02d9cf0bc1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 05 17:27:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 05 17:27:48 2024 +0000
tree cae7de308c2fba8a6f17b451224d8bc8ed059c1e
parent 502175c0ade8cc0a5fdb5b4e83e17add8218402e
parent 0c9a6ffb002857fa2d6cd551c2f308f70365a4a6

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

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 b485440..f5e3dd2 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1131,9 +1131,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")