commit bd14f102a2a2d10b0d6fe740619ead0f6ccf0df6
author Robin Lee <rgl@google.com> Mon Sep 08 11:18:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 08 11:18:34 2014 +0000
tree 6d10281a29f1f1fa325175c15858e0b1460ad843
parent 0a779207d5f937ebc4ddc0ff3827bc03b7d674f8
parent f7441111aebab8c090df3340a2dc266a07785ead

Merge "Revert "Implement IKeychainService.installkeyPair.""

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 091475a..6e77357 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -142,25 +142,6 @@
             broadcastStorageChange();
         }
 
-        @Override public void installKeyPair(byte[] privateKey, byte[] userCertificate,
-                String alias) {
-            checkCertInstallerOrSystemCaller();
-            if (!mKeyStore.importKey(Credentials.USER_PRIVATE_KEY + alias, privateKey, -1,
-                    KeyStore.FLAG_ENCRYPTED)) {
-                Log.e(TAG, "Failed to import private key " + alias);
-                return;
-            }
-            if (!mKeyStore.put(Credentials.USER_CERTIFICATE + alias, userCertificate, -1,
-                    KeyStore.FLAG_ENCRYPTED)) {
-                Log.e(TAG, "Failed to import user certificate " + userCertificate);
-                if (!mKeyStore.delKey(Credentials.USER_PRIVATE_KEY + alias)) {
-                    Log.e(TAG, "Failed to delete private key after certificate importing failed");
-                }
-                return;
-            }
-            broadcastStorageChange();
-        }
-
         private X509Certificate parseCertificate(byte[] bytes) throws CertificateException {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(bytes));