diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-08 18:22:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-08 18:22:36 +0000 |
| commit | f6bbe5074af8316030597b379582f714b0e16d41 (patch) | |
| tree | 4eb938af4d805cd973eeab63c24c292e8aba1f68 | |
| parent | d806ebb7a681510330fea7958d5be4618b186c69 (diff) | |
| parent | 44c777b623d27a75b14dd20f7f1bd102d063c651 (diff) | |
| download | android_packages_apps_KeyChain-f6bbe5074af8316030597b379582f714b0e16d41.tar.gz android_packages_apps_KeyChain-f6bbe5074af8316030597b379582f714b0e16d41.tar.bz2 android_packages_apps_KeyChain-f6bbe5074af8316030597b379582f714b0e16d41.zip | |
am 44c777b6: Switch from KeyStore.delKey/saw to KeyStore.delete/list.
* commit '44c777b623d27a75b14dd20f7f1bd102d063c651':
Switch from KeyStore.delKey/saw to KeyStore.delete/list.
| -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; |