Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

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) {

support/src/test/java/libcore/java/security/StandardNames.java

@@ -504,6 +504,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");
+            }
+
         }
     }