commit c35d2f8534a2085a90ecae1b00bb3d2065f1bdd0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 07 16:28:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 07 16:28:40 2020 +0000
tree 13dde41a83a5c88aed7e0f03a4c977010908712a
parent 26865f3895d07d3873ad7ecab94f3bfcc13bc781
parent ba1a4c7f6d9e6089547f558e38bdea526e046286

Merge "Fix StrongBoxOnly test" into rvc-dev am: ba1a4c7f6d

Change-Id: Ib0a0ebe7f6bcfad87687dab367615373b740f236

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
index 7ea3275..2af7775 100644
--- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -155,8 +155,8 @@
 using std::string;
 using DeviceUniqueAttestationTest = Keymaster4_1HidlTest;
 
-TEST_P(DeviceUniqueAttestationTest, StrongBoxOnly) {
-    if (SecLevel() != SecurityLevel::STRONGBOX) return;
+TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) {
+    if (SecLevel() == SecurityLevel::STRONGBOX) return;
 
     ASSERT_EQ(ErrorCode::OK, convert(GenerateKey(AuthorizationSetBuilder()
                                                          .Authorization(TAG_NO_AUTH_REQUIRED)