Merge "Bug 5575396: close spell session on language change"

1 files changed, 1 insertions, 2 deletions

diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index 97678da1af01..08b11f60f41c 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -88,6 +88,7 @@ public class SpellChecker implements SpellCheckerSessionListener {
     }
 
     private void setLocale(Locale locale) {
+        closeSession();
         final TextServicesManager textServicesManager = (TextServicesManager)
                 mTextView.getContext().getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
         if (!textServicesManager.isSpellCheckerEnabled()) {
@@ -107,8 +108,6 @@ public class SpellChecker implements SpellCheckerSessionListener {
         }
         mLength = 0;
 
-        // Reset the SpellParser pool: they will get re-created on demand
-        stopAllSpellParsers();
         mSpellParsers = new SpellParser[0];
 
         // This class is the global listener for locale change: warn other locale-aware objects