diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-03-27 21:08:21 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 21:08:21 +0000 |
| commit | c509c3e90bd1d23afb6ddf2436eee391eebc1a19 (patch) | |
| tree | 981d1d5037e8236df63351f0d82389cebc79236b /java/src | |
| parent | 655436eb2ceaea66cfddf77f2ee82ac2e5e5fd2d (diff) | |
| parent | 8de99ce3d8960684c28f2f8810b6dbefeb8853f3 (diff) | |
| download | latinime-c509c3e90bd1d23afb6ddf2436eee391eebc1a19.tar.gz latinime-c509c3e90bd1d23afb6ddf2436eee391eebc1a19.tar.xz latinime-c509c3e90bd1d23afb6ddf2436eee391eebc1a19.zip | |
am 8de99ce3: Merge "Don\'t notify dictpack for updates for service dump"
* commit '8de99ce3d8960684c28f2f8810b6dbefeb8853f3':
Don't notify dictpack for updates for service dump
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | 8 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFactory.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java index f4300c462..a1c1b6d3c 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java @@ -273,12 +273,14 @@ final public class BinaryDictionaryGetter { * @return The list of addresses of valid dictionary files, or null. */ public static ArrayList<AssetFileAddress> getDictionaryFiles(final Locale locale, - final Context context) { + final Context context, boolean notifyDictionaryPackForUpdates) { final boolean hasDefaultWordList = DictionaryInfoUtils.isDictionaryAvailable( context, locale); - BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context, - hasDefaultWordList); + if (notifyDictionaryPackForUpdates) { + BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context, + hasDefaultWordList); + } final File[] cachedWordLists = getCachedWordLists(locale.toString(), context); final String mainDictId = DictionaryInfoUtils.getMainDictId(locale); final DictPackSettings dictPackSettings = new DictPackSettings(context); diff --git a/java/src/com/android/inputmethod/latin/DictionaryFactory.java b/java/src/com/android/inputmethod/latin/DictionaryFactory.java index 49608d830..5dd02bd1c 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFactory.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFactory.java @@ -53,7 +53,7 @@ public final class DictionaryFactory { final LinkedList<Dictionary> dictList = new LinkedList<>(); final ArrayList<AssetFileAddress> assetFileList = - BinaryDictionaryGetter.getDictionaryFiles(locale, context); + BinaryDictionaryGetter.getDictionaryFiles(locale, context, true); if (null != assetFileList) { for (final AssetFileAddress f : assetFileList) { final ReadOnlyBinaryDictionary readOnlyBinaryDictionary = |