commit 7ee08071ee16a8c9acb02acdc246b046a739b3d7
author Keisuke Kuroyanagi <ksk@google.com> Fri Mar 11 05:51:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 11 05:51:22 2016 +0000
tree d4cb5284d8f3f3eb3aaf3645a67de31622608684
parent a2fbe47d6474ee82202fc61be3c0bee6ae4f385e
parent 5b47ae745fd0e2e3ad176912b18701974274e074

Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev am: 01ef02d785
am: 5b47ae745f

* commit '5b47ae745fd0e2e3ad176912b18701974274e074':
  Reset mWordIteratorWithText when SpellChecker locale is changed.

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 6959137..3f5ad66 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -926,7 +926,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 4c461ad..0ce4a12 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8923,8 +8923,7 @@
     }
 
     void onLocaleChanged() {
-        // Will be re-created on demand in getWordIterator with the proper new locale
-        mEditor.mWordIterator = null;
+        mEditor.onLocaleChanged();
     }
 
     /**