nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8de99ce3: Merge "Don\'t notify dictpack for updates for service dump" 

* commit '8de99ce3d8960684c28f2f8810b6dbefeb8853f3':
  Don't notify dictpack for updates for service dump
main
Jatin Matani 2015-03-27 21:08:21 +00:00 committed by Android Git Automerger
parent 655436eb2c 8de99ce3d8
commit c509c3e90b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
View File

@ -273,12 +273,14 @@ final public class BinaryDictionaryGetter {
* @return The list of addresses of valid dictionary files, or null. * @return The list of addresses of valid dictionary files, or null.
*/ */
public static ArrayList<AssetFileAddress> getDictionaryFiles(final Locale locale, public static ArrayList<AssetFileAddress> getDictionaryFiles(final Locale locale,
final Context context) { final Context context, boolean notifyDictionaryPackForUpdates) {
final boolean hasDefaultWordList = DictionaryInfoUtils.isDictionaryAvailable( final boolean hasDefaultWordList = DictionaryInfoUtils.isDictionaryAvailable(
context, locale); context, locale);
if (notifyDictionaryPackForUpdates) {
BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context, BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
hasDefaultWordList); hasDefaultWordList);
}
final File[] cachedWordLists = getCachedWordLists(locale.toString(), context); final File[] cachedWordLists = getCachedWordLists(locale.toString(), context);
final String mainDictId = DictionaryInfoUtils.getMainDictId(locale); final String mainDictId = DictionaryInfoUtils.getMainDictId(locale);
final DictPackSettings dictPackSettings = new DictPackSettings(context); final DictPackSettings dictPackSettings = new DictPackSettings(context);

2
java/src/com/android/inputmethod/latin/DictionaryFactory.java
View File

@ -53,7 +53,7 @@ public final class DictionaryFactory {
final LinkedList<Dictionary> dictList = new LinkedList<>(); final LinkedList<Dictionary> dictList = new LinkedList<>();
final ArrayList<AssetFileAddress> assetFileList = final ArrayList<AssetFileAddress> assetFileList =
BinaryDictionaryGetter.getDictionaryFiles(locale, context); BinaryDictionaryGetter.getDictionaryFiles(locale, context, true);
if (null != assetFileList) { if (null != assetFileList) {
for (final AssetFileAddress f : assetFileList) { for (final AssetFileAddress f : assetFileList) {
final ReadOnlyBinaryDictionary readOnlyBinaryDictionary = final ReadOnlyBinaryDictionary readOnlyBinaryDictionary =