commit f44a51908d90fdc6f5febd78fef4affd971ec44b
author Robin Lee <rgl@google.com> Mon Aug 03 17:18:02 2015 +0100
committer Robin Lee <rgl@google.com> Tue Dec 08 16:40:59 2015 +0000
tree 14a77126c8173da8389d95fccab97fb0f6391dc8
parent 770b21a5c84656af57c6d3c2812bd6111e69aab7

Implement removeKeyPair

Bug: 22541933
Change-Id: I37317e7c22e89816156e6e9a7abf4c5a59e8440a

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index ee19e50..cd2ac84 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -174,6 +174,11 @@
             return true;
         }
 
+        @Override public boolean removeKeyPair(String alias) {
+            checkCertInstallerOrSystemCaller();
+            return Credentials.deleteAllTypesForAlias(mKeyStore, alias);
+        }
+
         private X509Certificate parseCertificate(byte[] bytes) throws CertificateException {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(bytes));