diff options
| -rw-r--r-- | core/java/android/widget/SpellChecker.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java index 5fbbe4d40795..e929e7d55b56 100644 --- a/core/java/android/widget/SpellChecker.java +++ b/core/java/android/widget/SpellChecker.java @@ -84,9 +84,14 @@ public class SpellChecker implements SpellCheckerSessionListener { private void setLocale(Locale locale) { final TextServicesManager textServicesManager = (TextServicesManager) mTextView.getContext().getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE); - mSpellCheckerSession = textServicesManager.newSpellCheckerSession( - null /* Bundle not currently used by the textServicesManager */, - locale, this, false /* means any available languages from current spell checker */); + if (!textServicesManager.isSpellCheckerEnabled()) { + mSpellCheckerSession = null; + } else { + mSpellCheckerSession = textServicesManager.newSpellCheckerSession( + null /* Bundle not currently used by the textServicesManager */, + locale, this, + false /* means any available languages from current spell checker */); + } mCurrentLocale = locale; // Restore SpellCheckSpans in pool |