Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/inputmethods/LatinIME into eclair-mr2-plus-aosp

2009-10-09 10:29:59 -07:00 · 2009-10-09 10:29:59 -07:00 · dcaf27514b
parent ad5d6b8a30 0f3b8e8966
commit dcaf27514b
1 changed files with 4 additions and 0 deletions
--- 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) {