Fix: NPE in DistracterFilter

Change-Id: I19a92d79cf547aae8f15e7e5fd5309812ae4f2d5
This commit is contained in:
Keisuke Kuroyanagi 2014-05-22 16:33:45 +09:00
parent 5e2c4c0297
commit 9218c51129

View file

@ -77,6 +77,7 @@ public class DistracterFilter {
public DistracterFilter(final Context context, final List<InputMethodSubtype> enabledSubtypes) { public DistracterFilter(final Context context, final List<InputMethodSubtype> enabledSubtypes) {
mContext = context; mContext = context;
mLocaleToSubtypeMap = new HashMap<>(); mLocaleToSubtypeMap = new HashMap<>();
if (enabledSubtypes != null) {
for (final InputMethodSubtype subtype : enabledSubtypes) { for (final InputMethodSubtype subtype : enabledSubtypes) {
final Locale locale = SubtypeLocaleUtils.getSubtypeLocale(subtype); final Locale locale = SubtypeLocaleUtils.getSubtypeLocale(subtype);
if (mLocaleToSubtypeMap.containsKey(locale)) { if (mLocaleToSubtypeMap.containsKey(locale)) {
@ -86,6 +87,7 @@ public class DistracterFilter {
} }
mLocaleToSubtypeMap.put(locale, subtype); mLocaleToSubtypeMap.put(locale, subtype);
} }
}
mLocaleToKeyboardMap = new HashMap<>(); mLocaleToKeyboardMap = new HashMap<>();
mSuggest = new Suggest(); mSuggest = new Suggest();
mKeyboard = null; mKeyboard = null;