commit e0ac5ac6f0bcf58362af1ed723fa2a7d68ddd25d
author Keisuke Kuroyanagi <ksk@google.com> Wed Mar 09 15:33:30 2016 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Wed Mar 09 15:33:30 2016 +0900
tree 7bd9f31f56fe8b9e846b7092485b9e71a238440b
parent 40fd5fac48836aa85d45f8b6c729baed3b625b13

Reset mWordIteratorWithText when SpellChecker locale is changed.

Bug: 27537808
Change-Id: Ic55b543456cc859673b4c17cc5bf6e4b6da21e13

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 167aca7..5ba94e6 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -921,7 +921,8 @@
     }
 
     void onLocaleChanged() {
-        // Will be re-created on demand in getWordIterator with the proper new locale
+        // Will be re-created on demand in getWordIterator and getWordIteratorWithText with the
+        // proper new locale
         mWordIterator = null;
         mWordIteratorWithText = null;
     }

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ac3eaf7..b6e98ef 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8916,8 +8916,7 @@
     }
 
     void onLocaleChanged() {
-        // Will be re-created on demand in getWordIterator with the proper new locale
-        mEditor.mWordIterator = null;
+        mEditor.onLocaleChanged();
     }
 
     /**