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"""

2 files changed, 1 insertions, 9 deletions

diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl
index fd13f4f..45e9c93 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.
@@ -37,11 +35,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 6ce1a45..178ec81 100644
--- 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");
         }