summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-08-30 09:45:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-30 09:45:46 -0700
commit4cbcc2bc06cb228c2c5374920d2d4038685de8a6 (patch)
tree9f6b9a881d8150c3e5c05e020af159d1572d02ad
parentc5d0fac081c4c496b29586bff79dfff05755b716 (diff)
parent9906847cef4307896a64c68fa27da6603a7d8da2 (diff)
Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language"
-rw-r--r--core/java/android/widget/SpellChecker.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index ff13dcbf54f4..b89b8ec442c3 100644
--- 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);
}