diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-01 17:34:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 17:34:37 +0000 |
| commit | c461452eb78867032092b2fce14c2fcb3e7ab34e (patch) | |
| tree | 5b338ecfe89e6901b712d9a40bb359e99dadd440 /keystore/java/android/security/AndroidKeyStore.java | |
| parent | c6cc9d820d007a6b11df2bb3274d40743e1f1d87 (diff) | |
| parent | c8e557470fc94733c9340c4c67ee69c225bbaa70 (diff) | |
Merge "Hook in user authenticators and their exceptions."
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStore.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/keystore/java/android/security/AndroidKeyStore.java b/keystore/java/android/security/AndroidKeyStore.java index 846d1f1fbe9f..4650d27822b0 100644 --- a/keystore/java/android/security/AndroidKeyStore.java +++ b/keystore/java/android/security/AndroidKeyStore.java @@ -536,10 +536,9 @@ public class AndroidKeyStore extends KeyStoreSpi { if (params.getUserAuthenticators().isEmpty()) { args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED); } else { - // TODO: Pass-in user authenticator IDs once the Keymaster API has stabilized -// for (int userAuthenticatorId : params.getUserAuthenticators()) { -// args.addInt(KeymasterDefs.KM_TAG_USER_AUTH_ID, userAuthenticatorId); -// } + args.addInt(KeymasterDefs.KM_TAG_USER_AUTH_TYPE, + KeyStoreKeyConstraints.UserAuthenticator.allToKeymaster( + params.getUserAuthenticators())); } if (params.getUserAuthenticationValidityDurationSeconds() != null) { args.addInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT, |