1 files changed, 6 insertions, 1 deletions
diff --git a/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java b/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
index b457a41..5f688f8 100644
--- a/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
+++ b/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
@@ -36,7 +36,12 @@ public class KeyChainServiceTestSupport extends Service {
             = new IKeyChainServiceTestSupport.Stub() {
         @Override public boolean keystoreReset() {
             Log.d(TAG, "keystoreReset");
-            return mKeyStore.reset();
+            for (String key : mKeyStore.list("")) {
+                if (!mKeyStore.delete(key, KeyStore.UID_SELF)) {
+                    return false;
+                }
+            }
+            return true;
         }
         @Override public boolean keystoreSetPassword(String password) {
             Log.d(TAG, "keystoreSetPassword");