Merge "Fix NPE in AdditionalSubtypeSettings"

2012-04-23 20:25:14 -07:00 · 2012-04-23 20:25:14 -07:00 · a500bba8ed
parent 554b85845c 3e3bb36f1f
commit a500bba8ed
1 changed files with 1 additions and 0 deletions
--- a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
+++ b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
@ -366,6 +366,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
            final Preference pref = mSubtypePrefGroup.getPreference(i);
            if (pref instanceof SubtypePreference) {
                final InputMethodSubtype subtype = ((SubtypePreference)pref).getSubtype();
+                if (subtype == null) continue;
                if (sb.length() > 0) {
                    sb.append(AdditionalSubtype.PREF_SUBTYPE_SEPARATOR);
                }