commit a67467c19f774cb846a8f9d28767cf540e47fecb
author Alex Klyubin <klyubin@google.com> Mon Jun 08 19:58:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 08 19:58:09 2015 +0000
tree 64f93683a9b2b3bb6d9773157a401b59c89fd5b0
parent da690b93075f2d4199e5ad962869fc7197dc9836
parent 368a731af296f067f014cae80887f7077aca66a3

am 368a731a: am f6bbe507: am 44c777b6: Switch from KeyStore.delKey/saw to KeyStore.delete/list.

* commit '368a731af296f067f014cae80887f7077aca66a3':
  Switch from KeyStore.delKey/saw to KeyStore.delete/list.

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 0bb7bba..410956f 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -196,7 +196,7 @@
 
     private class AliasLoader extends AsyncTask<Void, Void, CertificateAdapter> {
         @Override protected CertificateAdapter doInBackground(Void... params) {
-            String[] aliasArray = mKeyStore.saw(Credentials.USER_PRIVATE_KEY);
+            String[] aliasArray = mKeyStore.list(Credentials.USER_PRIVATE_KEY);
             List<String> aliasList = ((aliasArray == null)
                                       ? Collections.<String>emptyList()
                                       : Arrays.asList(aliasArray));

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index f67b25f..8a94b19 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -160,7 +160,7 @@
             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)) {
+                if (!mKeyStore.delete(Credentials.USER_PRIVATE_KEY + alias)) {
                     Log.e(TAG, "Failed to delete private key after certificate importing failed");
                 }
                 return false;