From a2ce9a49acbc0842b5a714e8ecbd34be1a786477 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Thu, 22 May 2014 21:57:07 +0900
Subject: [PATCH] Fix NPE happening in unit tests.

Change-Id: I2fc0dba53e18883755ff77351c152a9d3534c92b
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ab7e66a09..217b0b162 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1747,9 +1747,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     @UsedForTesting
     /* package for test */ DistracterFilter createDistracterFilter() {
-        return new DistracterFilter(this /* Context */,
+        // Return an empty distracter filter when this method is called before onCreate().
+        return (mRichImm != null) ? new DistracterFilter(this /* Context */,
                 mRichImm.getMyEnabledInputMethodSubtypeList(
-                        true /* allowsImplicitlySelectedSubtypes */));
+                        true /* allowsImplicitlySelectedSubtypes */)) : new DistracterFilter();
     }
 
     public void dumpDictionaryForDebug(final String dictName) {