commit f1a1160c68f6c289d3b82573f1a16f9c52aebab4
author Alex Klyubin <klyubin@google.com> Wed Apr 08 21:37:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 08 21:37:26 2015 +0000
tree 8b83f650d478acd8ef26e7a78e1aff99e7d261ed
parent c48e8cf07a180e185948673579828d064e6efc7a
parent c0d6b7cb752b50ed37197e15cc6f305a0038e61b

am c0d6b7cb: Merge "Fix typo"

* commit 'c0d6b7cb752b50ed37197e15cc6f305a0038e61b':
  Fix typo

keystore/java/android/security/KeyStoreKeyConstraints.java

diff --git a/keystore/java/android/security/KeyStoreKeyConstraints.java b/keystore/java/android/security/KeyStoreKeyConstraints.java
index 0297323..202e38d 100644
--- a/keystore/java/android/security/KeyStoreKeyConstraints.java
+++ b/keystore/java/android/security/KeyStoreKeyConstraints.java
@@ -580,7 +580,7 @@
             } else if ("ctr".equals(modeLower)) {
                 return CTR;
             } else if ("gcm".equals(modeLower)) {
-                return CTR;
+                return GCM;
             } else {
                 throw new IllegalArgumentException("Unknown block mode: " + mode);
             }