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

Commit 23e07c97 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Fix: deleted PtNode handling in v403."

parents 53b01038 3844f74a

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ int Ver4PatriciaTriePolicy::getWordId(const CodePointArrayView wordCodePoints, 
        return NOT_A_WORD_ID;

    }

    const PtNodeParams ptNodeParams = mNodeReader.fetchPtNodeParamsInBufferFromPtNodePos(ptNodePos);

    if (ptNodeParams.isDeleted()) {

        return NOT_A_WORD_ID;

    }

    return ptNodeParams.getTerminalId();

}

tests/src/com/android/inputmethod/latin/BinaryDictionaryDecayingTests.java

+6 −1
Original line number Diff line number Diff line
@@ -746,7 +746,12 @@ public class BinaryDictionaryDecayingTests extends AndroidTestCase { 
        assertTrue(binaryDictionary.isValidWord("aaa"));

        assertTrue(binaryDictionary.removeUnigramEntry("aaa"));

        assertFalse(binaryDictionary.isValidWord("aaa"));



        onInputWord(binaryDictionary, "aaa", false /* isValidWord */);

        assertFalse(binaryDictionary.isValidWord("aaa"));

        onInputWord(binaryDictionary, "aaa", false /* isValidWord */);

        assertTrue(binaryDictionary.isValidWord("aaa"));

        assertTrue(binaryDictionary.removeUnigramEntry("aaa"));

        assertFalse(binaryDictionary.isValidWord("aaa"));

        binaryDictionary.close();

    }