diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2010-08-20 02:41:46 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 02:41:46 -0700 |
| commit | 3ecb4813f1f77ce9330b08a1a2ab83d26df05e51 (patch) | |
| tree | d70c2a3430607d8c049d5bcb7bc20496bee0ad30 /java/src | |
| parent | d56f8f5c10d6a959c23fda6ba0a588198fe7412b (diff) | |
| parent | 17dc363a63a20d18cd8161f917899b39aed6ddd6 (diff) | |
| download | latinime-3ecb4813f1f77ce9330b08a1a2ab83d26df05e51.tar.gz latinime-3ecb4813f1f77ce9330b08a1a2ab83d26df05e51.tar.xz latinime-3ecb4813f1f77ce9330b08a1a2ab83d26df05e51.zip | |
am 17dc363a: Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
Merge commit '17dc363a63a20d18cd8161f917899b39aed6ddd6' into gingerbread-plus-aosp
* commit '17dc363a63a20d18cd8161f917899b39aed6ddd6':
Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index d04930303..88a2b8398 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -335,6 +335,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } boolean isAlphabetMode() { + if (mCurrentId == null) { + return false; + } int currentMode = mCurrentId.mKeyboardMode; for (Integer mode : ALPHABET_MODES) { if (currentMode == mode) { diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 9bd16adb2..0f724f00a 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -968,7 +968,7 @@ public class LatinIME extends InputMethodService public void updateShiftKeyState(EditorInfo attr) { InputConnection ic = getCurrentInputConnection(); - if (attr != null && mKeyboardSwitcher.isAlphabetMode() && ic != null) { + if (ic != null && attr != null && mKeyboardSwitcher.isAlphabetMode()) { mKeyboardSwitcher.setShifted(mCapsLock || getCursorCapsMode(ic, attr) != 0); } } |