commit e3e96a54ed16384c8fe058b4c4ae4dc8d51bfef3
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 02 17:19:42 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 02 17:19:42 2020 +0000
tree 2cf56c52138d3f65697fe7431598ee89ae1bc715
parent 41a631de4dab77b902e9c847f541da63d14c23fa
parent 066f3af200e7d858ebe7836651ca73a1fe1e456a

Merge "Merge "Merge "Skip testRsaAttestation_DeviceLocked on emulator." am: b57f3c3289 am: 0f704a278a am: 955cb391b3" into rvc-d1-dev-plus-aosp am: a5e7c5a094 am: 72f5515200" into stage-aosp-rvc-ts-dev

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 637d57f..f33d82c 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -68,6 +68,8 @@
 
 import com.google.common.collect.ImmutableSet;
 
+import androidx.test.filters.RequiresDevice;
+
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
 
@@ -380,6 +382,7 @@
     }
 
     @RestrictedBuildTest
+    @RequiresDevice  // Emulators have no place to store the needed key
     public void testRsaAttestation_DeviceLocked() throws Exception {
         String keystoreAlias = "test_key";
         Date now = new Date();