settings: check if ime switcher pref was remove previously

This could happend in tablet devices

JIRA: BUGDUMP-20712
https://jira.cyanogenmod.org/browse/BUGDUMP-20712
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Change-Id: I85c1d6e56f85e3220311aabc68d6532d6ffdf59f

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index b583d52..1d31874 100644 (file)
--- 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