summaryrefslogtreecommitdiffstats
path: root/support/src/test/java/libcore
diff options
context:
space:
mode:
authorAn Liu <an1.liu@sta.samsung.com>2014-02-05 16:06:48 -0800
committerNarayan Kamath <narayan@google.com>2014-02-07 09:24:18 +0000
commitf0cd15d29ea97346b7c2e870969907cd586b1b30 (patch)
treee2e2df365d503c22779cd646267311cffec7b7d2 /support/src/test/java/libcore
parent250e0e3478307917b508406e3f694dcc43234f19 (diff)
downloadlibcore-f0cd15d29ea97346b7c2e870969907cd586b1b30.zip
libcore-f0cd15d29ea97346b7c2e870969907cd586b1b30.tar.gz
libcore-f0cd15d29ea97346b7c2e870969907cd586b1b30.tar.bz2
Skip TimaKeyStore in KeyStoreTest
TimaKeyStore is Samsung's TrustZone-based KeyStore service provider. It should be skipped for KeyStore test cases since Samsung has it's own test cases.
Diffstat (limited to 'support/src/test/java/libcore')
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index 1d7a71f..57cf575 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -519,6 +519,12 @@ public final class StandardNames extends Assert {
if (Security.getProvider("AndroidKeyStore") != null) {
provide("KeyStore", "AndroidKeyStore");
}
+
+ // TimaKeyStore provider
+ if (Security.getProvider("TimaKeyStore") != null) {
+ provide("KeyStore", "TimaKeyStore");
+ }
+
}
}