diff options
| author | Max Bires <jbires@google.com> | 2019-10-24 15:28:01 -0700 |
|---|---|---|
| committer | Max Bires <jbires@google.com> | 2019-10-24 22:38:58 +0000 |
| commit | 218005c3238c30994fc4e09ac73728e0f22e8f75 (patch) | |
| tree | cf72730229510ec38e94b074e4b53da3d5fa88f6 /support | |
| parent | c8dee28ef6251e380f8039b136fc313533b7c3f1 (diff) | |
| download | platform_packages_apps_KeyChain-218005c3238c30994fc4e09ac73728e0f22e8f75.tar.gz platform_packages_apps_KeyChain-218005c3238c30994fc4e09ac73728e0f22e8f75.tar.bz2 platform_packages_apps_KeyChain-218005c3238c30994fc4e09ac73728e0f22e8f75.zip | |
Removing references to reset prior to aidl removal
reset() is deprecated in the frameworks layer. This commit removes one
of two references left to it.
Bug: 143309987
Test: These are the tests
Change-Id: Ieaf5f8172fef113f386e2c4d5664fcff7132bf45
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java | 7 |
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"); |
