aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-04-24 11:01:45 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-04-24 11:01:45 +0900
commit3e3bb36f1f9d33b850e6dde89d0f0c0b036fcdb2 (patch)
tree96e64ad7bf1c19a4bf2dd8a54ebef5acc6ce74bf /java
parentfa1affbaecf4b851169294203654556cdc31ea38 (diff)
downloadlatinime-3e3bb36f1f9d33b850e6dde89d0f0c0b036fcdb2.tar.gz
latinime-3e3bb36f1f9d33b850e6dde89d0f0c0b036fcdb2.tar.xz
latinime-3e3bb36f1f9d33b850e6dde89d0f0c0b036fcdb2.zip
Fix NPE in AdditionalSubtypeSettings
Bug: 6384416 Change-Id: I878071b8b78acce51649f9637b59830ab681c696
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java1
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);
}