diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-15 12:35:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 04:54:19 +0000 |
| commit | bdc78678dedc6b66b9584948b908cd8cf77c6b30 (patch) | |
| tree | 7fe3145e6dbc6e35be1ce083e6128a40e1ee015b /keystore/java/android/security/KeyChain.java | |
| parent | 5dc4a440d17a15a1717c7c70a66e012bce6bb25c (diff) | |
| parent | f75aadc028f2e79541a269bf2c74dcb3482e2ec7 (diff) | |
Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 131e6893baa9..0da2b9989444 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -397,8 +397,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"); } |