From 9218c5112995969325a8a900924d0cff49824184 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Thu, 22 May 2014 16:33:45 +0900
Subject: [PATCH] Fix: NPE in DistracterFilter

Change-Id: I19a92d79cf547aae8f15e7e5fd5309812ae4f2d5
---
 .../latin/utils/DistracterFilter.java            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java b/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
index 1cf06b451..f1057da0b 100644
--- a/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
+++ b/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
@@ -77,14 +77,16 @@ public class DistracterFilter {
     public DistracterFilter(final Context context, final List<InputMethodSubtype> enabledSubtypes) {
         mContext = context;
         mLocaleToSubtypeMap = new HashMap<>();
-        for (final InputMethodSubtype subtype : enabledSubtypes) {
-            final Locale locale = SubtypeLocaleUtils.getSubtypeLocale(subtype);
-            if (mLocaleToSubtypeMap.containsKey(locale)) {
-                // Multiple subtypes are enabled for one locale.
-                // TODO: Investigate what we should do for this case.
-                continue;
+        if (enabledSubtypes != null) {
+            for (final InputMethodSubtype subtype : enabledSubtypes) {
+                final Locale locale = SubtypeLocaleUtils.getSubtypeLocale(subtype);
+                if (mLocaleToSubtypeMap.containsKey(locale)) {
+                    // Multiple subtypes are enabled for one locale.
+                    // TODO: Investigate what we should do for this case.
+                    continue;
+                }
+                mLocaleToSubtypeMap.put(locale, subtype);
             }
-            mLocaleToSubtypeMap.put(locale, subtype);
         }
         mLocaleToKeyboardMap = new HashMap<>();
         mSuggest = new Suggest();