Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31f8b2d2 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am d62554ea: am a3598346: Merge "Add API to query KeyChain algorithm support,... 

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

* commit 'd62554ea':
  Add API to query KeyChain algorithm support, pt. 2
parents af210f6d d62554ea

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -20759,8 +20759,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";

keystore/java/android/security/KeyChain.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }