From 9a0216def936a368f87acef082318e99650c2c97 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 2 Dec 2013 16:25:20 +0900 Subject: [PATCH] Avoid NPE by checking Bug: 11956240 Change-Id: I3de1ebbf96fa2422124e4d8e50190adfa09b8a49 --- .../android/inputmethod/latin/settings/SettingsFragment.java | 3 +++ 1 file changed, 3 insertions(+) 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]);