am d9d6bfe9: am d76cefa2: am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev

* commit 'd9d6bfe92f37b7ba82c3ad1f5a28ad16ee67e221': Update Trusted Credentials screen in settings
2014-08-07 13:53:05 +00:00
parent 090ee11755 47f90bee09
commit bdbd4a55ef
4 changed files with 42 additions and 29 deletions
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -468,7 +468,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");
        }