commit af6235fba5240652fe2ad72b87ed01d74563c8ba
author Giovanni Pezzino <giovax@google.com> Tue Dec 21 16:29:11 2021 +0100
committer Giovanni Pezzino <giovax@google.com> Tue Dec 21 16:29:11 2021 +0100
tree 976cee277f0e7cd382893ca1093dc131dc15078f
parent 597ecdd25f7ffa36b3937c141a33c82530513f91

Merge "Added check for lock screen support"
from android11-tests-dev am: c5416f2824

Original change:
https://android-review.googlesource.com/c/platform/cts/+/1525784

Bug: b/204816377
Test: atest CtsKeyStoreTestCases

Change-Id: I0834c65af433374c01189489b83ce23bbd52c936

tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java

diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 85de847..15a8543 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -1108,7 +1108,7 @@
                     assertThat("Software KM is version 3", attestation.getKeymasterVersion(),
                             is(3));
                     assertThat(softwareEnforced.getOsVersion(), is(systemOsVersion));
-                    checkSystemPatchLevel(teeEnforced.getOsPatchLevel(), systemPatchLevel);
+                    checkSystemPatchLevel(softwareEnforced.getOsPatchLevel(), systemPatchLevel);
                 }
 
                 assertNull("Software attestation cannot provide root of trust",