commit 738e422b00b14b4959de4654db4edd20b786b18f
author Janis Danisevskis <jdanis@google.com> Wed May 12 08:39:52 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Wed May 12 17:29:26 2021 -0700
tree 971604c5576f2ccc04892eee403adcb1a5b11ef4
parent 919e8c1ba3417c11087c5e1a243359c8f9416ce6

Keystore 2.0 SPI: Fix NPE in getUniqueAliases.

getUniqueAliases may return a null if an error occurred. This would lead
to a NPE in engineAliases.

This patch makes getUniqueAliases return an empty HashSet instead.

Test: atest KeystoreTests

Change-Id: I387d90ea851a8b9c18bb2b20d1a0bfc1ab76c99f

keystore/tests/Android.bp

diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index 2315a85..7de4523 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -28,6 +28,7 @@
     static_libs: [
         "androidx.test.rules",
         "hamcrest-library",
+        "mockito-target-minus-junit4",
     ],
     platform_apis: true,
     libs: ["android.test.runner"],