aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-10-09 10:24:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-09 10:24:57 -0700
commit95a21916b9536f77d4619b5fd44845b2e047ca6d (patch)
tree817b1dccad5f7ddda6d3da5831ec442cfe04bf31
parentf195bd94f3d64bf15956a728d860e6a17f57ec30 (diff)
parent0f3b8e8966d3da99e7844d6ca8083cccf23bef01 (diff)
downloadlatinime-95a21916b9536f77d4619b5fd44845b2e047ca6d.tar.gz
latinime-95a21916b9536f77d4619b5fd44845b2e047ca6d.tar.xz
latinime-95a21916b9536f77d4619b5fd44845b2e047ca6d.zip
am 0f3b8e89: Merge change Ieef539c3 into eclair
Merge commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01' into eclair-mr2 * commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01': Fix a potential IllegalArgumentException caught by monkeys. #2176776
-rw-r--r--src/com/android/inputmethod/latin/LatinIME.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 8c9102d8c..ae296aff6 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -693,6 +693,10 @@ public class LatinIME extends InputMethodService
}
if (mInputView.isShifted()) {
// TODO: This doesn't work with ß, need to fix it in the next release.
+ if (keyCodes == null || keyCodes[0] < Character.MIN_CODE_POINT
+ || keyCodes[0] > Character.MAX_CODE_POINT) {
+ return;
+ }
primaryCode = new String(keyCodes, 0, 1).toUpperCase().charAt(0);
}
if (mPredicting) {