diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2021-02-26 09:14:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 09:14:43 +0000 |
| commit | 26085ee2ff5aaba6d71b518cb602baacb789a264 (patch) | |
| tree | 256304aba96bf4fbb831cdff299883e0fe9bd926 /services/tests | |
| parent | 9044d1e472ddea5b629e8ddde8e5bc83b53a49e7 (diff) | |
| parent | dbf8a7c1bd0f301aec8383d1c24054c6d47c32ef (diff) | |
Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f96343c65df7accaae3fb5032771dbcd05191f5
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java index 4e1454bd0962..1db5fcc70420 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java @@ -150,7 +150,7 @@ public class LockSettingsServiceTestable extends LockSettingsService { } @Override - public RecoverableKeyStoreManager getRecoverableKeyStoreManager(KeyStore keyStore) { + public RecoverableKeyStoreManager getRecoverableKeyStoreManager() { return mRecoverableKeyStoreManager; } |