Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac85462 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1

parents a549101f baf263ca

java/src/com/android/inputmethod/latin/ExpandableDictionary.java

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ public class ExpandableDictionary extends Dictionary { 
    /**

     * Returns the word's frequency or -1 if not found

     */

    public int getWordFrequency(CharSequence word) {

    protected int getWordFrequency(CharSequence word) {

        Node node = searchNode(mRoots, word, 0, word.length());

        return (node == null) ? -1 : node.mFrequency;

    }

java/src/com/android/inputmethod/latin/LatinIME.java

+0 −1
Original line number Diff line number Diff line
@@ -1427,7 +1427,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 


    private void saveWordInHistory(CharSequence result) {

        if (mWord.size() <= 1) {

            mWord.reset();

            return;

        }

        // Skip if result is null. It happens in some edge case.