From 169acbf9f0127c7b6a95592fc412524d27b50953 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Fri, 25 Apr 2014 13:36:46 -0700
Subject: [PATCH] Add null check in createDistracterFilter().

Change-Id: Iff2b73081d48f32b1d3a5d5b32c9734979362c23
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 971bd1a16..a77cedc48 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -543,7 +543,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     private DistracterFilter createDistracterFilter() {
         final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
-        final Keyboard keyboard = mainKeyboardView.getKeyboard();
+        // TODO: Create Keyboard when mainKeyboardView is null.
+        // TODO: Figure out the most reasonable keyboard for the filter. Refer to the
+        // spellchecker's logic.
+        final Keyboard keyboard = (mainKeyboardView != null) ?
+                mainKeyboardView.getKeyboard() : null;
         final DistracterFilter distracterFilter = new DistracterFilter(mInputLogic.mSuggest,
                 keyboard);
         return distracterFilter;