Merge "Add jni method for removeUnigramEntry()."

1 files changed, 14 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 4dbfb44d6..543f74fc4 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -207,6 +207,7 @@ public final class BinaryDictionary extends Dictionary {
     private static native boolean addUnigramWordNative(long dict, int[] word, int probability,
             int[] shortcutTarget, int shortcutProbability, boolean isBeginningOfSentence,
             boolean isNotAWord, boolean isBlacklisted, int timestamp);
+    private static native boolean removeUnigramWordNative(long dict, int[] word);
     private static native boolean addBigramWordsNative(long dict, int[] word0,
             boolean isBeginningOfSentence, int[] word1, int probability, int timestamp);
     private static native boolean removeBigramWordsNative(long dict, int[] word0,
@@ -436,6 +437,19 @@ public final class BinaryDictionary extends Dictionary {
         return true;
     }
 
+    // Remove a unigram entry from the binary dictionary in native code.
+    public boolean removeUnigramEntry(final String word) {
+        if (TextUtils.isEmpty(word)) {
+            return false;
+        }
+        final int[] codePoints = StringUtils.toCodePointArray(word);
+        if (!removeUnigramWordNative(mNativeDict, codePoints)) {
+            return false;
+        }
+        mHasUpdated = true;
+        return true;
+    }
+
     // Add an n-gram entry to the binary dictionary with timestamp in native code.
     public boolean addNgramEntry(final PrevWordsInfo prevWordsInfo, final String word,
             final int probability, final int timestamp) {