diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-18 10:48:33 +0100 |
---|---|---|
committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-09-08 17:59:42 +0100 |
commit | f0ae135049048424bceccb0799b12377181b25f0 (patch) | |
tree | e4a86db25d50e83db28a0b58cc79eaaadcb72004 /keystore/java/android/security/KeyChain.java | |
parent | 97e75e1da97f01e82c0105b1f915821a99dda196 (diff) |
Extend IKeyChainService AIDL with CACert retrieval
Bug:16029580
Change-Id: I41a3bd2f3bd95550e59f1d0d0acd0e765d7b62d7
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
-rw-r--r-- | keystore/java/android/security/KeyChain.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 0da2b9989444..131e6893baa9 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -397,7 +397,8 @@ public final class KeyChain { return KeyStore.getInstance().isHardwareBacked(algorithm); } - private static X509Certificate toCertificate(byte[] bytes) { + /** @hide */ + public static X509Certificate toCertificate(byte[] bytes) { if (bytes == null) { throw new IllegalArgumentException("bytes == null"); } |