Reset mWordIteratorWithText when SpellChecker locale is changed.

Bug: 27537808
Change-Id: Ic55b543456cc859673b4c17cc5bf6e4b6da21e13

2 files changed, 3 insertions, 3 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 167aca7d0b22..5ba94e6355c9 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -921,7 +921,8 @@ public class Editor {
     }
 
     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;
     }
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ac3eaf7df334..b6e98ef4c77c 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8916,8 +8916,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
 
     void onLocaleChanged() {
-        // Will be re-created on demand in getWordIterator with the proper new locale
-        mEditor.mWordIterator = null;
+        mEditor.onLocaleChanged();
     }
 
     /**