Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language"

2011-08-30 09:45:46 -07:00
parent c5d0fac081 9906847cef
commit 4cbcc2bc06
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -112,6 +112,8 @@ public class SpellChecker implements SpellCheckerSessionListener {

    private void scheduleSpellCheck() {
        if (mLength == 0) return;
+        if (spellCheckerSession == null) return;
+
        if (mChecker != null) {
            mTextView.removeCallbacks(mChecker);
        }