Remove clearAndFlushDictionary() and use clear().

clearAndFlushDictionary() was needed when dictionaries are constructed
in java side. All expandable dictionaries now use native code; thus,
this method is same to clear() and no longer needed.

Bug: 13755213
Change-Id: Ifd836e64f8ff807930f7cd2319b103b65e8fce70

5 files changed, 6 insertions, 14 deletions

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index 331384fa5..34bece29f 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -542,7 +542,7 @@ public class DictionaryFacilitatorForSuggest {
         if (userHistoryDict == null) {
             return;
         }
-        userHistoryDict.clearAndFlushDictionary();
+        userHistoryDict.clear();
     }
 
     // This method gets called only when the IME receives a notification to remove the
@@ -553,7 +553,7 @@ public class DictionaryFacilitatorForSuggest {
         if (personalizationDict == null) {
             return;
         }
-        personalizationDict.clearAndFlushDictionary();
+        personalizationDict.clear();
     }
 
     public void addMultipleDictionaryEntriesToPersonalizationDictionary(
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index a6a735414..89fa819c1 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -244,7 +244,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
                 true /* useFullEditDistance */, mLocale, mDictType, true /* isUpdatable */);
     }
 
-    protected void clear() {
+    public void clear() {
         ExecutorUtils.getExecutor(mDictName).execute(new Runnable() {
             @Override
             public void run() {
diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
index 712e314a8..46862c1c0 100644
--- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
+++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
@@ -136,18 +136,10 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
     }
 
     @UsedForTesting
-    public void clearAndFlushDictionary() {
-        // Clear the node structure on memory
-        clear();
-        // Then flush the cleared state of the dictionary on disk.
-        asyncFlushBinaryDictionary();
-    }
-
-    @UsedForTesting
     public void clearAndFlushDictionaryWithAdditionalAttributes(
             final Map<String, String> attributeMap) {
         mAdditionalAttributeMap = attributeMap;
-        clearAndFlushDictionary();
+        clear();
     }
 
     /* package */ void runGCIfRequired() {
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
index 385b525b6..7c43182bc 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -135,7 +135,7 @@ public class PersonalizationHelper {
                 if (entry.getValue() != null) {
                     final DecayingExpandableBinaryDictionaryBase dict = entry.getValue().get();
                     if (dict != null) {
-                        dict.clearAndFlushDictionary();
+                        dict.clear();
                     }
                 }
             }
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index 60599f66d..e054ab68c 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -147,7 +147,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
         final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
                 mContext, locale);
         dict.waitAllTasksForTests();
-        dict.clearAndFlushDictionary();
+        dict.clear();
         dict.close();
         dict.waitAllTasksForTests();
     }