diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-23 20:25:14 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 20:25:14 -0700 |
| commit | a500bba8edfba4a24ffb49c2b181e0d69098d8ea (patch) | |
| tree | 35bf8a6cba7e3f9b7b849907d67429842cfecdef /java/src | |
| parent | 554b85845c205a0fe288bc63368e64ec1357113d (diff) | |
| parent | 3e3bb36f1f9d33b850e6dde89d0f0c0b036fcdb2 (diff) | |
| download | latinime-a500bba8edfba4a24ffb49c2b181e0d69098d8ea.tar.gz latinime-a500bba8edfba4a24ffb49c2b181e0d69098d8ea.tar.xz latinime-a500bba8edfba4a24ffb49c2b181e0d69098d8ea.zip | |
Merge "Fix NPE in AdditionalSubtypeSettings"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java index 613c20304..994b917a7 100644 --- 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); } |