PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '21c430160fe6d9a6e53600ac350e3661802b85aa':
  Dont crash if there is no spellchecker
This commit is contained in:
Jason Monk
2015-06-03 13:56:51 +00:00
committed by Android Git Automerger
parent 3364ddaa8d 21c430160f
commit b84c5d3fce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -254,8 +254,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
if (spellChecker != null) { if (spellChecker != null) {
final TextServicesManager tsm = (TextServicesManager) getSystemService( final TextServicesManager tsm = (TextServicesManager) getSystemService(
Context.TEXT_SERVICES_MANAGER_SERVICE); 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())); spellChecker.setSummary(sci.loadLabel(getPackageManager()));
} else { } else {
spellChecker.setSummary(R.string.switch_off_text); spellChecker.setSummary(R.string.switch_off_text);