diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-08 12:31:04 +0900 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-05-08 12:31:04 +0900 |
| commit | 1471fbad66f68a06494ac3efea5d9d16ea46b322 (patch) | |
| tree | 630038ff6a41ac0bf9cc01d2bda1e8d94b5f38e1 /java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java | |
| parent | 04348c3637253956109a0e75b4d61713c2830390 (diff) | |
| download | latinime-1471fbad66f68a06494ac3efea5d9d16ea46b322.tar.gz latinime-1471fbad66f68a06494ac3efea5d9d16ea46b322.tar.xz latinime-1471fbad66f68a06494ac3efea5d9d16ea46b322.zip | |
Extend jni interface for dictionary migration.
Bug: 13406708
Change-Id: Iadad6df296467d0e5b631fba4a409d53c8a5a6f2
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(); + } } } |