am c0d6b7cb: Merge "Fix typo"

* commit 'c0d6b7cb752b50ed37197e15cc6f305a0038e61b': Fix typo
2015-04-08 21:37:26 +00:00
parent c48e8cf07a c0d6b7cb75
commit f1a1160c68
1 changed files with 1 additions and 1 deletions
--- 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);
            }