Merge "Fix NPE in AdditionalSubtypeSettings"

This commit is contained in:
Tadashi G. Takaoka 2012-04-23 20:25:14 -07:00 committed by Android (Google) Code Review
commit a500bba8ed

View file

@ -366,6 +366,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
final Preference pref = mSubtypePrefGroup.getPreference(i); final Preference pref = mSubtypePrefGroup.getPreference(i);
if (pref instanceof SubtypePreference) { if (pref instanceof SubtypePreference) {
final InputMethodSubtype subtype = ((SubtypePreference)pref).getSubtype(); final InputMethodSubtype subtype = ((SubtypePreference)pref).getSubtype();
if (subtype == null) continue;
if (sb.length() > 0) { if (sb.length() > 0) {
sb.append(AdditionalSubtype.PREF_SUBTYPE_SEPARATOR); sb.append(AdditionalSubtype.PREF_SUBTYPE_SEPARATOR);
} }