diff options
author | Alex Klyubin <klyubin@google.com> | 2015-06-04 21:06:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 21:06:29 +0000 |
commit | df6c67028a0341a5b05d5097e12ae4d0cbb69fa4 (patch) | |
tree | f72cc04646a5f3c030807f3104737b1d601b206d /keystore | |
parent | b070e486c8afb2b83483759ec9966c585f7a8b59 (diff) | |
parent | 6c03bf523d6b0e4edfade726ed0ee1c49c4d0f69 (diff) | |
download | frameworks_base-df6c67028a0341a5b05d5097e12ae4d0cbb69fa4.zip frameworks_base-df6c67028a0341a5b05d5097e12ae4d0cbb69fa4.tar.gz frameworks_base-df6c67028a0341a5b05d5097e12ae4d0cbb69fa4.tar.bz2 |
Merge "Streamline Android Keystore delete entry operation." into mnc-dev
Diffstat (limited to 'keystore')
-rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreSpi.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index 701bd67..05ddef6 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java @@ -674,12 +674,13 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { @Override public void engineDeleteEntry(String alias) throws KeyStoreException { - if (!isKeyEntry(alias) && !isCertificateEntry(alias)) { + if (!engineContainsAlias(alias)) { return; } + // At least one entry corresponding to this alias exists in keystore if (!Credentials.deleteAllTypesForAlias(mKeyStore, alias)) { - throw new KeyStoreException("No such entry " + alias); + throw new KeyStoreException("Failed to delete entry: " + alias); } } @@ -849,9 +850,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { throw new KeyStoreException("entry == null"); } - if (engineContainsAlias(alias)) { - engineDeleteEntry(alias); - } + Credentials.deleteAllTypesForAlias(mKeyStore, alias); if (entry instanceof KeyStore.TrustedCertificateEntry) { KeyStore.TrustedCertificateEntry trE = (KeyStore.TrustedCertificateEntry) entry; |