diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-08 09:46:15 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-06-08 09:53:35 -0700 |
| commit | 44c777b623d27a75b14dd20f7f1bd102d063c651 (patch) | |
| tree | afc3c79417826179f3cdd44cf6a06ee301398c87 | |
| parent | 67c838de37d8c3658391a46aba83dca522ab26f8 (diff) | |
| download | android_packages_apps_KeyChain-44c777b623d27a75b14dd20f7f1bd102d063c651.tar.gz android_packages_apps_KeyChain-44c777b623d27a75b14dd20f7f1bd102d063c651.tar.bz2 android_packages_apps_KeyChain-44c777b623d27a75b14dd20f7f1bd102d063c651.zip | |
Switch from KeyStore.delKey/saw to KeyStore.delete/list.
KeyStore.delKey was replaced by KeyStore.delete, and KeyStore.saw was
replaced by KeyStore.list.
Bug: 18088752
Change-Id: I45eae9d252dc304f9d8d6fa8bfd1a9729ef090b3
| -rw-r--r-- | src/com/android/keychain/KeyChainActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/keychain/KeyChainService.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ public class KeyChainActivity extends Activity { 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)); 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 @@ public class KeyChainService extends IntentService { 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; |