diff options
| author | 2013-04-02 18:40:54 +0000 | |
|---|---|---|
| committer | 2013-04-02 18:40:54 +0000 | |
| commit | a35983469b40ad697af5f1ea1ead41e0e5649f10 (patch) | |
| tree | e8677e49c10ddae3fe05b812a23d1ca3985974f7 | |
| parent | ed181586a7ef0229edb27ba33d087d199ec81d53 (diff) | |
| parent | 5b7e90ac937857c10a3d49b244ec75ca539b9a22 (diff) | |
Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 20dcf2e871b0..f1dc65468168 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20756,8 +20756,8 @@ package android.security { method public static android.content.Intent createInstallIntent(); method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; - method public static boolean isBoundKeyType(java.lang.String); - method public static boolean isKeyTypeSupported(java.lang.String); + method public static boolean isBoundKeyAlgorithm(java.lang.String); + method public static boolean isKeyAlgorithmSupported(java.lang.String); field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED"; field public static final java.lang.String EXTRA_CERTIFICATE = "CERT"; field public static final java.lang.String EXTRA_NAME = "name"; diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index e077257843f6..c99dff02e97f 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -361,7 +361,7 @@ public final class KeyChain { * specific {@code PrivateKey} type indicated by {@code algorithm} (e.g., * "RSA"). */ - public static boolean isKeyTypeSupported(String algorithm) { + public static boolean isKeyAlgorithmSupported(String algorithm) { return "RSA".equals(algorithm); } @@ -372,8 +372,8 @@ public final class KeyChain { * hardware support that can be used to bind keys to the device in a way * that makes it non-exportable. */ - public static boolean isBoundKeyType(String algorithm) { - if (!isKeyTypeSupported(algorithm)) { + public static boolean isBoundKeyAlgorithm(String algorithm) { + if (!isKeyAlgorithmSupported(algorithm)) { return false; } |