nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix: NPE in DistracterFilter

Browse source 
Change-Id: I19a92d79cf547aae8f15e7e5fd5309812ae4f2d5
This commit is contained in:
Keisuke Kuroyanagi 2014-05-22 16:33:45 +09:00
parent 5e2c4c0297
commit 9218c51129
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
View file

@ -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();