nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3ecb4813: am 17dc363a: Fix an NPE found in KeyboardSwitcher.isAlphabetMode() 

Merge commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51'

* commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51':
  Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
main
Ken Wakasa 2010-08-23 12:02:52 -07:00 committed by Android Git Automerger
parent 36cd376aee 3ecb4813f1
commit 159bc3cf43
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -335,6 +335,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
} }
boolean isAlphabetMode() { boolean isAlphabetMode() {
if (mCurrentId == null) {
return false;
}
int currentMode = mCurrentId.mKeyboardMode; int currentMode = mCurrentId.mKeyboardMode;
for (Integer mode : ALPHABET_MODES) { for (Integer mode : ALPHABET_MODES) {
if (currentMode == mode) { if (currentMode == mode) {

2
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -968,7 +968,7 @@ public class LatinIME extends InputMethodService
public void updateShiftKeyState(EditorInfo attr) { public void updateShiftKeyState(EditorInfo attr) {
InputConnection ic = getCurrentInputConnection(); InputConnection ic = getCurrentInputConnection();
if (attr != null && mKeyboardSwitcher.isAlphabetMode() && ic != null) { if (ic != null && attr != null && mKeyboardSwitcher.isAlphabetMode()) {
mKeyboardSwitcher.setShifted(mCapsLock || getCursorCapsMode(ic, attr) != 0); mKeyboardSwitcher.setShifted(mCapsLock || getCursorCapsMode(ic, attr) != 0);
} }
} }