am b6a19229: Merge "Make required binary dictionary version use FormatSpec.*"

* commit 'b6a19229ba6c996c18232a66c33293d343601fcf':
  Make required binary dictionary version use FormatSpec.*

2 files changed, 2 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 7afd657a0..f785835b8 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -140,7 +140,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
         // only, which right now use format 2 (dicts using format 4 use Decaying*, which overrides
         // this method).
         // TODO: Migrate these dicts to ver4 format, and remove this function.
-        return formatVersion == 2;
+        return formatVersion == FormatSpec.VERSION2;
     }
 
     public boolean isValidDictionary() {
diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
index 9b573b4b8..3a5c11554 100644
--- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
+++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
@@ -53,7 +53,7 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
     public static final int FREQUENCY_FOR_WORDS_IN_DICTS = FREQUENCY_FOR_TYPED;
     public static final int FREQUENCY_FOR_WORDS_NOT_IN_DICTS = Dictionary.NOT_A_PROBABILITY;
 
-    public static final int REQUIRED_BINARY_DICTIONARY_VERSION = 4;
+    public static final int REQUIRED_BINARY_DICTIONARY_VERSION = FormatSpec.VERSION4;
 
     /** Locale for which this user history dictionary is storing words */
     private final Locale mLocale;