commit 22963d9224e594fd8ba50d7ab33d448d910476a6
author Yohei Yukawa <yukawa@google.com> Sat Jun 27 21:49:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 27 21:49:05 2015 +0000
tree 2285ddc33fbaad25f8db3484f0cdea52600c441b
parent 92f9c17fe74bea7a9ec00d58dffc8164735efb13
parent 473440d79b1b93fac06cba220f70181492855763

am 473440d7: Merge "Dont crash if there is no spellchecker" into mnc-dev

* commit '473440d79b1b93fac06cba220f70181492855763':
  Dont crash if there is no spellchecker

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 93ece66..e8ef5ef 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -254,8 +254,9 @@
         if (spellChecker != null) {
             final TextServicesManager tsm = (TextServicesManager) getSystemService(
                     Context.TEXT_SERVICES_MANAGER_SERVICE);
-            if (tsm.isSpellCheckerEnabled()) {
-                final SpellCheckerInfo sci = tsm.getCurrentSpellChecker();
+            final SpellCheckerInfo sci = tsm.getCurrentSpellChecker();
+            spellChecker.setEnabled(sci != null);
+            if (tsm.isSpellCheckerEnabled() && sci != null) {
                 spellChecker.setSummary(sci.loadLabel(getPackageManager()));
             } else {
                 spellChecker.setSummary(R.string.switch_off_text);