am 6aa64e91: Merge "Add clearContextualDictionary()."

* commit '6aa64e91ed431717f22b9621b424b04b270b32ae':
  Add clearContextualDictionary().

1 files changed, 13 insertions, 12 deletions

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
index 05ebe1160..f5ad79222 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
@@ -564,24 +564,25 @@ public class DictionaryFacilitator {
         return getFrequencyInternal(word, true /* isGettingMaxFrequencyOfExactMatches */);
     }
 
-    public void clearUserHistoryDictionary() {
-        final ExpandableBinaryDictionary userHistoryDict =
-                mDictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
-        if (userHistoryDict == null) {
-            return;
+    private void clearSubDictionary(final String dictName) {
+        final ExpandableBinaryDictionary dictionary = mDictionaries.getSubDict(dictName);
+        if (dictionary != null) {
+            dictionary.clear();
         }
-        userHistoryDict.clear();
+    }
+
+    public void clearUserHistoryDictionary() {
+        clearSubDictionary(Dictionary.TYPE_USER_HISTORY);
     }
 
     // This method gets called only when the IME receives a notification to remove the
     // personalization dictionary.
     public void clearPersonalizationDictionary() {
-        final ExpandableBinaryDictionary personalizationDict =
-                mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION);
-        if (personalizationDict == null) {
-            return;
-        }
-        personalizationDict.clear();
+        clearSubDictionary(Dictionary.TYPE_PERSONALIZATION);
+    }
+
+    public void clearContextualDictionary() {
+        clearSubDictionary(Dictionary.TYPE_CONTEXTUAL);
     }
 
     public void addEntriesToPersonalizationDictionary(