[RF3] Cleanups

Make the version number a single number on native and java side.
Also, remove the hasValidContents method. It's useless since the
native code already checks this when creating the dictionary (I
wish I had known that when I added it).

Bug: 11281748
Change-Id: I572d37429972b2f280e4bdb748b709e5d0d7737e

1 files changed, 1 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java
index 8833c35aa..2cbec7cec 100644
--- a/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java
+++ b/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java
@@ -161,7 +161,7 @@ public class Ver4DictDecoder extends AbstractDictDecoder {
         }
         final FileHeader header = super.readHeader(mDictBuffer);
         final int version = header.mFormatOptions.mVersion;
-        if (version != 4) {
+        if (version != FormatSpec.VERSION4) {
             throw new UnsupportedFormatException("File header has a wrong version : " + version);
         }
         return header;