aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-12-02 16:25:20 +0900
committerTadashi G. Takaoka <takaoka@google.com>2013-12-02 16:25:20 +0900
commit9a0216def936a368f87acef082318e99650c2c97 (patch)
tree61de3ca67fb543847cf108fba64b3f36b387d648 /java/src
parent75eb9c89342760c59425bfbce25823019474dfc7 (diff)
downloadlatinime-9a0216def936a368f87acef082318e99650c2c97.tar.gz
latinime-9a0216def936a368f87acef082318e99650c2c97.tar.xz
latinime-9a0216def936a368f87acef082318e99650c2c97.zip
Avoid NPE by checking
Bug: 11956240 Change-Id: I3de1ebbf96fa2422124e4d8e50190adfa09b8a49
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsFragment.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index 7d307a4f1..2cee130ec 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -71,6 +71,9 @@ public final class SettingsFragment extends InputMethodSettingsFragment
// Because the "%s" summary trick of {@link ListPreference} doesn't work properly before
// KitKat, we need to update the summary programmatically.
final ListPreference listPreference = (ListPreference)findPreference(prefKey);
+ if (listPreference == null) {
+ return;
+ }
final CharSequence entries[] = listPreference.getEntries();
final int entryIndex = listPreference.findIndexOfValue(listPreference.getValue());
listPreference.setSummary(entryIndex < 0 ? null : entries[entryIndex]);