commit baeab42b59d9a9dbaa16f8f78100b84184bc61ba
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 05 17:30:20 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 05 17:30:20 2024 +0000
tree d0a1beb9ab20d7426a06999c0a532d33445c698c
parent 0462cc589b5c644733bd4a550bca33904d861b88
parent f54075d5d4bfaf7605c7b1b33818db02d9cf0bc1

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

Original change: https://android-review.googlesource.com/c/platform/build/+/3255473

Change-Id: Icd7a835359eaeee9d96d0c663e9a195dcce884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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")