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

am 9218c511: Fix: NPE in DistracterFilter 

* commit '9218c5112995969325a8a900924d0cff49824184':
  Fix: NPE in DistracterFilter
main
Keisuke Kuroyanagi 2014-05-22 07:39:39 +00:00 committed by Android Git Automerger
parent d4f1e551c6 9218c51129
commit c22f778435
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();