diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-13 11:12:57 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-13 11:34:04 -0700 |
| commit | 9b3e005a4ebd94af2d234cc5470e9691437d3888 (patch) | |
| tree | f74f675688bc2f476317d60c91ec3bb537a2698a /keystore/java/android/security/KeyStoreKeyGeneratorSpi.java | |
| parent | fbf1472d613572d991bc9d68ded4c9e937f13586 (diff) | |
| download | frameworks_base-9b3e005a4ebd94af2d234cc5470e9691437d3888.zip frameworks_base-9b3e005a4ebd94af2d234cc5470e9691437d3888.tar.gz frameworks_base-9b3e005a4ebd94af2d234cc5470e9691437d3888.tar.bz2 | |
Unhide the new AndroidKeyStore API.
Bug: 18088752
Change-Id: I93f87cbb1cd04a4a2e34f3d544d678c92cf052ee
Diffstat (limited to 'keystore/java/android/security/KeyStoreKeyGeneratorSpi.java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyGeneratorSpi.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java b/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java index 3b28045..72c485a 100644 --- a/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java +++ b/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java @@ -133,7 +133,7 @@ public abstract class KeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { throw new IllegalStateException("Digest algorithm must be specified for HMAC key"); } } - int keySizeBits = (spec.getKeySize() != null) ? spec.getKeySize() : mDefaultKeySizeBits; + int keySizeBits = (spec.getKeySize() != -1) ? spec.getKeySize() : mDefaultKeySizeBits; args.addInt(KeymasterDefs.KM_TAG_KEY_SIZE, keySizeBits); @KeyStoreKeyProperties.PurposeEnum int purposes = spec.getPurposes(); int[] keymasterBlockModes = KeymasterUtils.getKeymasterBlockModesFromJcaBlockModes( |