commit 5e9cf464912149fb306f656406362ef3fec48f6d
author Thomas Joseph Avila <tavila@google.com> Tue Jul 23 00:50:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 00:50:43 2019 +0000
tree 85f27c5cca2b634f503d6d60b5aa864f60691ce7
parent f1a67b301f2eff5567f0c57034fa9d1cd8ba10ba
parent 1a20113e688d0b276bbc0e53db6feef8f64f933d

Merge "Setting callbacktype type to invalid value before invoking HIDL call" into pie-vts-dev

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
index 89bcca6..784ae30 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -751,6 +751,7 @@
  * presented.
  */
 TEST_F(SigningOperationsTest, NoUserConfirmation) {
+    if (SecLevel() == SecurityLevel::STRONGBOX) return;
     ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
                                              .RsaSigningKey(1024, 65537)
                                              .Digest(Digest::NONE)