commit 27fdc0efa50afe2c69ce6e27410cff7414aa7db9
author Alex Klyubin <klyubin@google.com> Thu Jun 04 21:30:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 21:30:24 2015 +0000
tree 20b16f586b6eedafbd144d709eba9780d8b48429
parent 4e56fc1b7413797520b51cdc4583b8b03a910f96
parent 28d99c2419d0b8f472fe45bb31d1ffbde61145e0

am 28d99c24: am df6c6702: Merge "Streamline Android Keystore delete entry operation." into mnc-dev

* commit '28d99c2419d0b8f472fe45bb31d1ffbde61145e0':
  Streamline Android Keystore delete entry operation.

keystore/java/android/security/keystore/AndroidKeyStoreSpi.java

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 @@
 
     @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 @@
             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;