aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJatin Matani <jatinm@google.com>2015-03-27 19:54:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-27 19:54:33 +0000
commit8de99ce3d8960684c28f2f8810b6dbefeb8853f3 (patch)
treeff942e93857b4c335608922b20758847c1b85c3f /java
parent23a7998edde3b25d4dc7a14b8a653ccd325d2405 (diff)
parent2cc2d31418b482e26df657746e2b2711f73aabac (diff)
downloadlatinime-8de99ce3d8960684c28f2f8810b6dbefeb8853f3.tar.gz
latinime-8de99ce3d8960684c28f2f8810b6dbefeb8853f3.tar.xz
latinime-8de99ce3d8960684c28f2f8810b6dbefeb8853f3.zip
Merge "Don't notify dictpack for updates for service dump"
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java8
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFactory.java2
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 =