am b84c5d3f: am 21c43016: Merge "Dont crash if there is no spellchecker"

* commit 'b84c5d3fce61bf302f4cca26fab163638572beaf':
  Dont crash if there is no spellchecker
This commit is contained in:
Jason Monk
2015-06-03 17:37:15 +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);