diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-08 22:12:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-08 22:12:55 +0000 |
| commit | 0e496527fef61f6cf2ebd0559fcdec66825c99b1 (patch) | |
| tree | 9be4c0771b47a588fb6875674fb85b5b6900d08d /keystore | |
| parent | 7513d53cae2273704d25835f97d83f36817e629a (diff) | |
| parent | da66cab36e8085a1457565be69b55b38dfee186e (diff) | |
| download | frameworks_base-0e496527fef61f6cf2ebd0559fcdec66825c99b1.zip frameworks_base-0e496527fef61f6cf2ebd0559fcdec66825c99b1.tar.gz frameworks_base-0e496527fef61f6cf2ebd0559fcdec66825c99b1.tar.bz2 | |
am da66cab3: am f1a1160c: am c0d6b7cb: Merge "Fix typo"
* commit 'da66cab36e8085a1457565be69b55b38dfee186e':
Fix typo
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyConstraints.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreKeyConstraints.java b/keystore/java/android/security/KeyStoreKeyConstraints.java index 2da548d..8917103 100644 --- a/keystore/java/android/security/KeyStoreKeyConstraints.java +++ b/keystore/java/android/security/KeyStoreKeyConstraints.java @@ -580,7 +580,7 @@ public abstract class KeyStoreKeyConstraints { } else if ("ctr".equals(modeLower)) { return CTR; } else if ("gcm".equals(modeLower)) { - return CTR; + return GCM; } else { throw new IllegalArgumentException("Unknown block mode: " + mode); } |