am f1a1160c: am c0d6b7cb: Merge "Fix typo"

* commit 'f1a1160c68f6c289d3b82573f1a16f9c52aebab4': Fix typo
2015-04-08 22:03:55 +00:00
parent 9be1016b44 f1a1160c68
commit da66cab36e
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);
            }