commit a29da5469066bcddec9baeacbb5101bfd19a68bd
author Baranidharan Muthukumaran <bmuthuku@qti.qualcomm.com> Tue Jun 04 17:53:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 17:53:26 2019 -0700
tree 5822d1355c6832a1b886955132564f2381db044a
parent 357d68b24aef6e0eaef4a19d339e0c2f4c23630f
parent f1a67b301f2eff5567f0c57034fa9d1cd8ba10ba

Merge "Skip NoUserConfirmation VTS test for Strongbox" into pie-vts-dev
am: f1a67b301f

Change-Id: If7dab84389f3a3bd0922faa00209561b71b739da

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 c1d8a95..a2b43f0 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)