Merge "Bug 5575396: close spell session on language change" into ics-mr1

Author: Gilles Debunne

core/java/android/widget/SpellChecker.java

@@ -82,6 +82,8 @@ public SpellChecker(TextView textView) {
     }
 
     private void setLocale(Locale locale) {
+        closeSession();
+
         final TextServicesManager textServicesManager = (TextServicesManager)
                 mTextView.getContext().getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
         if (!textServicesManager.isSpellCheckerEnabled()) {
@@ -104,12 +106,6 @@ private void setLocale(Locale locale) {
         // Change SpellParsers' wordIterator locale
         mWordIterator = new WordIterator(locale);
 
-        // Stop all SpellParsers
-        final int length = mSpellParsers.length;
-        for (int i = 0; i < length; i++) {
-            mSpellParsers[i].finish();
-        }
-
         // Remove existing misspelled SuggestionSpans
         mTextView.removeMisspelledSpans((Editable) mTextView.getText());