diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-07 13:41:08 +0000 |
|---|---|---|
| committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-07 13:41:08 +0000 |
| commit | 678e3ecc937c00969830700dffb42fb1ee232f7c (patch) | |
| tree | 98c7144f8cca3b46411549aad4bbdcaa5376df00 /keystore/java/android/security | |
| parent | 1386627335a79dd02fb34db344e63ca3abfce013 (diff) | |
Revert "Update Trusted Credentials screen in settings"
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.
Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
Diffstat (limited to 'keystore/java/android/security')
| -rw-r--r-- | keystore/java/android/security/IKeyChainService.aidl | 7 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index a93891a42662..60fd7f79318d 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -15,8 +15,6 @@ */ package android.security; -import android.content.pm.ParceledListSlice; - /** * Caller is required to ensure that {@link KeyStore#unlock * KeyStore.unlock} was successful. @@ -34,11 +32,6 @@ interface IKeyChainService { // APIs used by Settings boolean deleteCaCertificate(String alias); boolean reset(); - ParceledListSlice getUserCaAliases(); - ParceledListSlice getSystemCaAliases(); - boolean containsCaAlias(String alias); - byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem); - List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem); // APIs used by KeyChainActivity void setGrant(int uid, String alias, boolean value); 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"); } |