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

* commit '473440d79b1b93fac06cba220f70181492855763':
  Dont crash if there is no spellchecker
This commit is contained in:
Yohei Yukawa
2015-06-27 21:49:05 +00:00
committed by Android Git Automerger

View File

@@ -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);