aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-27 21:59:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-27 21:59:39 -0700
commit71fb8af7c55f6821bf190261e29728e51e895266 (patch)
treeade1d1f6da8bb844bd75a04ff9bf3c528bf2dc6e /java/src
parent8051fd0d73f169c968a2a2dd02d8099842775633 (diff)
parentec183b50ff1b44390a44ec94f8910373f7dbf985 (diff)
downloadlatinime-71fb8af7c55f6821bf190261e29728e51e895266.tar.gz
latinime-71fb8af7c55f6821bf190261e29728e51e895266.tar.xz
latinime-71fb8af7c55f6821bf190261e29728e51e895266.zip
am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit 'ec183b50ff1b44390a44ec94f8910373f7dbf985': Fix possible ArrayIndexOutOfBoundsException
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/SubtypeLocale.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeLocale.java b/java/src/com/android/inputmethod/latin/SubtypeLocale.java
index 9cbfe6698..5e28cc2d0 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeLocale.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeLocale.java
@@ -114,7 +114,7 @@ public final class SubtypeLocale {
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);