aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-10-29 18:40:37 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-10-29 18:40:37 +0900
commitc7318bbc0b47662799d2f7a01e5b53edb43ebf2a (patch)
treec3b867e492e590f7aa0629beef9ca8deab8f3ee5 /java/src
parentfd08cd498ed958519cf3f70b5bb54a9d3d0ab164 (diff)
downloadlatinime-c7318bbc0b47662799d2f7a01e5b53edb43ebf2a.tar.gz
latinime-c7318bbc0b47662799d2f7a01e5b53edb43ebf2a.tar.xz
latinime-c7318bbc0b47662799d2f7a01e5b53edb43ebf2a.zip
Fix possible NPE
Bug: 7398904 Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c2afb1c4e..c66ff9504 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1932,7 +1932,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
private SuggestedWords getSuggestedWords(final int sessionId) {
final Keyboard keyboard = mKeyboardSwitcher.getKeyboard();
- if (keyboard == null) {
+ if (keyboard == null || mSuggest == null) {
return SuggestedWords.EMPTY;
}
final String typedWord = mWordComposer.getTypedWord();