Projects >> frameworks_base_disabled >>cbf9d1401228c3b1856b0846ed6c237aeda89d7f

Chunk
Conflicting content
        mLength = 0;

<<<<<<< HEAD
        }
        // 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
=======
        // Change SpellParsers' wordIterator locale
        mWordIterator = new WordIterator(locale);

        // Remove existing misspelled SuggestionSpans
        mTextView.removeMisspelledSpans((Editable) mTextView.getText());

        // This class is the listener for locale change: warn other locale-aware objects
>>>>>>> 7e7b4e7c822e7c9aacbe4add52511079cff757cc
        mTextView.onLocaleChanged();
    }
Solution content
        }
        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
        mTextView.onLocaleChanged();
    }
File
SpellChecker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation