commit c3fdfed11bce5bec9422909f7dadc72667ee45cf
author Nikita Ioffe <ioffe@google.com> Mon Jan 11 23:50:31 2021 +0000
committer Nikita Ioffe <ioffe@google.com> Mon Jan 11 23:50:31 2021 +0000
tree 3bde523e234a9d51183a568d21e4759781c3e82e
parent 4e98e687ec71fe7e62dd6c11454febaa190e3db0

Fix test_sign_apex

Test: python -m unittest test_sign_apex
Change-Id: I2a27a394b3de32fa29e487bea0b7721502a8bd98

tools/releasetools/apex_utils.py

diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index dc6e3ca..6808f15 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -370,11 +370,12 @@
   extra_signapk_args = OPTIONS.extra_signapk_args[:]
   extra_signapk_args.extend(['-a', '4096'])
 
+  password = container_pw.get(container_key) if container_pw else None
   common.SignFile(
       aligned_apex,
       signed_apex,
       container_key,
-      container_pw.get(container_key),
+      password,
       codename_to_api_level_map=codename_to_api_level_map,
       extra_signapk_args=extra_signapk_args)