commit 0f3b8e8966d3da99e7844d6ca8083cccf23bef01
author Android (Google) Code Review <android-gerrit@google.com> Fri Oct 09 13:17:48 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 09 13:17:48 2009 -0400
tree 856528ea29b8a78b2e6f4173af9258bcf40e6f55
parent b7a94fd7d66ad2cb73ed6c7226de5535935ab8b0
parent eef539c3f2b60af74a3ce05ac68288e7f86709ae

Merge change Ieef539c3 into eclair

* changes:
  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) {