diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2010-08-23 12:02:52 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-08-23 12:02:52 -0700 |
| commit | 159bc3cf436836aa5908d9aa0cb511a6a9f89195 (patch) | |
| tree | 8d47c49ef57df315b5a3a5b818a3764064a91a6e /java/src | |
| parent | 36cd376aee1396fd739ff81fd6eaa13e3d9d0392 (diff) | |
| parent | 3ecb4813f1f77ce9330b08a1a2ab83d26df05e51 (diff) | |
| download | latinime-159bc3cf436836aa5908d9aa0cb511a6a9f89195.tar.gz latinime-159bc3cf436836aa5908d9aa0cb511a6a9f89195.tar.xz latinime-159bc3cf436836aa5908d9aa0cb511a6a9f89195.zip | |
am 3ecb4813: am 17dc363a: Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
Merge commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51'
* commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51':
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); } } |