diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-03 13:56:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-03 13:56:51 +0000 |
| commit | b84c5d3fce61bf302f4cca26fab163638572beaf (patch) | |
| tree | d0e0c0ddaf233b1b7e346a82efcb46ac2162445d /src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | |
| parent | 3364ddaa8d031b3a0bc41272a12df51bb5271e26 (diff) | |
| parent | 21c430160fe6d9a6e53600ac350e3661802b85aa (diff) | |
| download | packages_apps_Settings-b84c5d3fce61bf302f4cca26fab163638572beaf.tar.gz packages_apps_Settings-b84c5d3fce61bf302f4cca26fab163638572beaf.tar.bz2 packages_apps_Settings-b84c5d3fce61bf302f4cca26fab163638572beaf.zip | |
am 21c43016: Merge "Dont crash if there is no spellchecker"
* commit '21c430160fe6d9a6e53600ac350e3661802b85aa':
Dont crash if there is no spellchecker
Diffstat (limited to 'src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 8f23ce93c0..f1d2df38dc 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -254,8 +254,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 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); |