Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac37d4d9 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Move dict version check to proper place."

parents d6d2a41b c3b15195

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

+9 −9
Original line number Diff line number Diff line
@@ -528,8 +528,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { 
                        } else if (mBinaryDictionary == null) {

                            // Otherwise, load the existing dictionary.

                            loadBinaryDictionaryLocked();

                        }

                        mNeedsToReload = false;

                            if (mBinaryDictionary != null && !(isValidDictionaryLocked()

                                    // TODO: remove the check below

                                    && matchesExpectedBinaryDictFormatVersionForThisType(
@@ -539,6 +537,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { 
                                // existing files if appropriate.

                                createNewDictionaryLocked();

                            }

                        }

                        mNeedsToReload = false;

                    } finally {

                        mIsReloading.set(false);

                    }