commit ec183b50ff1b44390a44ec94f8910373f7dbf985
author Tadashi G. Takaoka <takaoka@google.com> Sun Mar 24 22:54:39 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Mar 24 22:54:39 2013 -0700
tree 4099e81e58740864809870a1fb6849b4975ea51f
parent 2a01fc22d40d00192dd53dd6413ab9cce56d778b
parent fb658d6c531de8cfd55e4d36bffc9ccabc401f94

am fb658d6c: Fix possible ArrayIndexOutOfBoundsException

* commit 'fb658d6c531de8cfd55e4d36bffc9ccabc401f94':
  Fix possible ArrayIndexOutOfBoundsException

java/src/com/android/inputmethod/latin/SubtypeLocale.java

diff --git a/java/src/com/android/inputmethod/latin/SubtypeLocale.java b/java/src/com/android/inputmethod/latin/SubtypeLocale.java
index 9cbfe66..5e28cc2 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeLocale.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeLocale.java
@@ -114,7 +114,7 @@
 
         final String[] keyboardLayoutSetMap = res.getStringArray(
                 R.array.locale_and_extra_value_to_keyboard_layout_set_map);
-        for (int i = 0; i < keyboardLayoutSetMap.length; i += 2) {
+        for (int i = 0; i + 1 < keyboardLayoutSetMap.length; i += 2) {
             final String key = keyboardLayoutSetMap[i];
             final String keyboardLayoutSet = keyboardLayoutSetMap[i + 1];
             sLocaleAndExtraValueToKeyboardLayoutSetMap.put(key, keyboardLayoutSet);