Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev

Browse Source
This commit is contained in:
Kenny Root
2013-04-02 18:40:54 +00:00
committed by Android (Google) Code Review
parent ed181586a7 5b7e90ac93
commit a35983469b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -20756,8 +20756,8 @@ package android.security {
method public static android.content.Intent createInstallIntent(); 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.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 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 isBoundKeyAlgorithm(java.lang.String);
method public static boolean isKeyTypeSupported(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 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_CERTIFICATE = "CERT";
field public static final java.lang.String EXTRA_NAME = "name"; field public static final java.lang.String EXTRA_NAME = "name";

6
keystore/java/android/security/KeyChain.java
View File

@@ -361,7 +361,7 @@ public final class KeyChain {
* specific {@code PrivateKey} type indicated by {@code algorithm} (e.g., * specific {@code PrivateKey} type indicated by {@code algorithm} (e.g.,
* "RSA"). * "RSA").
*/ */
public static boolean isKeyTypeSupported(String algorithm) { public static boolean isKeyAlgorithmSupported(String algorithm) {
return "RSA".equals(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 * hardware support that can be used to bind keys to the device in a way
* that makes it non-exportable. * that makes it non-exportable.
*/ */
public static boolean isBoundKeyType(String algorithm) { public static boolean isBoundKeyAlgorithm(String algorithm) {
if (!isKeyTypeSupported(algorithm)) { if (!isKeyAlgorithmSupported(algorithm)) {
return false; return false;
} }