diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-08 05:24:56 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 05:24:56 +0000 |
| commit | 1d43340f89cf8032d320aea6994723b674f3f420 (patch) | |
| tree | cf05ccca97fbdd1b7cf3c777383d7e59e207dabd /java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java | |
| parent | 0cca28f5e78f3fdb27b095661bffbe2516926dc8 (diff) | |
| parent | 08d12a1be31ad1708262d7181d7b8bb2da4025df (diff) | |
| download | latinime-1d43340f89cf8032d320aea6994723b674f3f420.tar.gz latinime-1d43340f89cf8032d320aea6994723b674f3f420.tar.xz latinime-1d43340f89cf8032d320aea6994723b674f3f420.zip | |
am 08d12a1b: Merge "Extend jni interface for dictionary migration."
* commit '08d12a1be31ad1708262d7181d7b8bb2da4025df':
Extend jni interface for dictionary migration.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index c825ca462..e3bed318e 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -470,7 +470,10 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { } if (mBinaryDictionary.isValidDictionary() && needsToMigrateDictionary(mBinaryDictionary.getFormatVersion())) { - mBinaryDictionary.migrateTo(DICTIONARY_FORMAT_VERSION); + if (!mBinaryDictionary.migrateTo(DICTIONARY_FORMAT_VERSION)) { + Log.e(TAG, "Dictionary migration failed: " + mDictName); + removeBinaryDictionaryLocked(); + } } } |