summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index b583d52..1d31874 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -194,8 +194,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
boolean showCmImeSwitcher = getResources().getBoolean(
com.android.internal.R.bool.config_show_cmIMESwitcher);
if (!showCmImeSwitcher) {
- getPreferenceScreen().removePreference(
- findPreference(Settings.System.STATUS_BAR_IME_SWITCHER));
+ Preference pref = findPreference(Settings.System.STATUS_BAR_IME_SWITCHER);
+ if (pref != null) {
+ getPreferenceScreen().removePreference(pref);
+ }
}
// Spell Checker