Merge "Skip attestation test if device doesn't support it" into android13-tests-devandroid13-tests-dev

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 19bb686f094..109b5b899de 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -371,6 +371,7 @@ public class KeyAttestationTest {
     public void testAttestationKmVersionMatchesFeatureVersion() throws Exception {
         if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC))
             return;
+        assumeTrue("Device does not support attestation", TestUtils.isAttestationSupported());
 
         String keystoreAlias = "test_key";
         Date now = new Date();
@@ -416,6 +417,7 @@ public class KeyAttestationTest {
     public void testAttestationKmVersionMatchesFeatureVersionStrongBox() throws Exception {
         if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC))
             return;
+        assumeTrue("Device does not support attestation", TestUtils.isAttestationSupported());
 
         int keyStoreFeatureVersionStrongBox =
                 TestUtils.getFeatureVersionKeystoreStrongBox(getContext());