diff options
| author |   satok <satok@google.com> | 2010-06-03 20:00:45 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-06-03 20:31:45 +0900 |
| commit | 0eaca7aa99b052abcc0cf9edb701b6c597b2e311 (patch) | |
| tree | 6e7418e2a1eda9439a299846fb304da3ccc07cf3 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 8edbaf0433fd88c3cb31b6fe750955570ed386f8 (diff) | |
| download | latinime-0eaca7aa99b052abcc0cf9edb701b6c597b2e311.tar.gz latinime-0eaca7aa99b052abcc0cf9edb701b6c597b2e311.tar.xz latinime-0eaca7aa99b052abcc0cf9edb701b6c597b2e311.zip | |
Fix NPE and addded logOnWarning
Change-Id: I4cca905ce044c014490ada6d00a76d79a20ed885
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index edc2e087f..520974580 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -812,7 +812,8 @@ public class LatinIME extends InputMethodService mKeyboardSwitcher = new KeyboardSwitcher(this, this); } mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher); - if (mKeyboardSwitcher.getInputView() != null) { + if (mKeyboardSwitcher.getInputView() != null + && mKeyboardSwitcher.getKeyboardMode() != KeyboardSwitcher.MODE_NONE) { mKeyboardSwitcher.setVoiceMode(mEnableVoice && mEnableVoiceButton, mVoiceOnPrimary); } mKeyboardSwitcher.makeKeyboards(true); |