diff options
| author |   Adrian Velicu <adrianv@google.com> | 2014-10-31 06:55:19 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 06:55:19 +0000 |
| commit | 93a9b836f94bf52e394b03e6910245cd5212d329 (patch) | |
| tree | c497da0cd026f3164ad2a686159a0a70f7183199 /tests/src | |
| parent | cc9dd07aa32279a79a7ebc115141a58a21f08edd (diff) | |
| parent | aa20342d7ee40fb13483fc2a663493de185a33cd (diff) | |
| download | latinime-93a9b836f94bf52e394b03e6910245cd5212d329.tar.gz latinime-93a9b836f94bf52e394b03e6910245cd5212d329.tar.xz latinime-93a9b836f94bf52e394b03e6910245cd5212d329.zip | |
am aa20342d: Merge "Using "blacklist" flag as "possibly offensive""
* commit 'aa20342d7ee40fb13483fc2a663493de185a33cd':
Using "blacklist" flag as "possibly offensive"
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java index 457e7af8e..5c261a94d 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java +++ b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java @@ -178,7 +178,8 @@ public class Ver2DictDecoder extends AbstractDictDecoder { throw new IOException("Cannot read the dictionary header."); } if (header.mFormatOptions.mVersion != FormatSpec.VERSION2 && - header.mFormatOptions.mVersion != FormatSpec.VERSION201) { + header.mFormatOptions.mVersion != FormatSpec.VERSION201 && + header.mFormatOptions.mVersion != FormatSpec.VERSION202) { throw new UnsupportedFormatException("File header has a wrong version : " + header.mFormatOptions.mVersion); } diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java index 2c2152be7..b52b8c485 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java +++ b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java @@ -124,7 +124,8 @@ public class Ver2DictEncoder implements DictEncoder { @Override public void writeDictionary(final FusionDictionary dict, final FormatOptions formatOptions) throws IOException, UnsupportedFormatException { - if (formatOptions.mVersion > FormatSpec.VERSION201) { + // We no longer support anything but the latest version of v2. + if (formatOptions.mVersion != FormatSpec.VERSION202) { throw new UnsupportedFormatException( "The given format options has wrong version number : " + formatOptions.mVersion); |