am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev

* commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3': Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
2014-08-15 13:40:22 +00:00
parent 1982323f65 bab1a3f396
commit a93fb72f85
4 changed files with 29 additions and 42 deletions
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -468,8 +468,7 @@ public final class KeyChain {
        return KeyStore.getInstance().isHardwareBacked(algorithm);
    }

-    /** @hide */
-    public static X509Certificate toCertificate(byte[] bytes) {
+    private static X509Certificate toCertificate(byte[] bytes) {
        if (bytes == null) {
            throw new IllegalArgumentException("bytes == null");
        }