commit 95a21916b9536f77d4619b5fd44845b2e047ca6d
author Amith Yamasani <yamasani@google.com> Fri Oct 09 10:24:57 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 09 10:24:57 2009 -0700
tree 817b1dccad5f7ddda6d3da5831ec442cfe04bf31
parent f195bd94f3d64bf15956a728d860e6a17f57ec30
parent 0f3b8e8966d3da99e7844d6ca8083cccf23bef01

am 0f3b8e89: Merge change Ieef539c3 into eclair

Merge commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01' into eclair-mr2

* commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01':
  Fix a potential IllegalArgumentException caught by monkeys. #2176776

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

diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 8c9102d..ae296af 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -693,6 +693,10 @@
         }
         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) {