diff options
| author | An Liu <an1.liu@sta.samsung.com> | 2014-02-05 16:06:48 -0800 |
|---|---|---|
| committer | Daniel Xie <dxie@google.com> | 2015-07-14 21:47:27 +0000 |
| commit | 9ea5717a2568291bd49b531b733dafbc99d1d5bb (patch) | |
| tree | f4a24f71b9c3fe6f5cab7930c7f0c21d8f16bc9e /luni | |
| parent | 19679b0fde4e1a7321101b558e2f4961daec923e (diff) | |
| download | libcore-9ea5717a2568291bd49b531b733dafbc99d1d5bb.tar.gz libcore-9ea5717a2568291bd49b531b733dafbc99d1d5bb.tar.bz2 libcore-9ea5717a2568291bd49b531b733dafbc99d1d5bb.zip | |
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.
(cherry picked from commit f0cd15d29ea97346b7c2e870969907cd586b1b30)
Change-Id: I7c63dd1e037b0d8bed58593c2c9c883010106286
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/test/java/libcore/java/security/KeyStoreTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/luni/src/test/java/libcore/java/security/KeyStoreTest.java b/luni/src/test/java/libcore/java/security/KeyStoreTest.java index ddee6cedc..47aa72ab8 100644 --- a/luni/src/test/java/libcore/java/security/KeyStoreTest.java +++ b/luni/src/test/java/libcore/java/security/KeyStoreTest.java @@ -170,7 +170,8 @@ public class KeyStoreTest extends TestCase { // Don't bother testing BC on RI // TODO enable AndroidKeyStore when CTS can set up the keystore return (StandardNames.IS_RI && ks.getProvider().getName().equals("BC")) - || "AndroidKeyStore".equalsIgnoreCase(ks.getType()); + || "AndroidKeyStore".equalsIgnoreCase(ks.getType()) + || "TimaKeyStore".equalsIgnoreCase(ks.getType()); } private static boolean isNullPasswordAllowed(KeyStore ks) { |