aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-06-12 14:25:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-12 14:25:22 -0700
commit681f1239688f873c1ed0cd4e9e35fea598af965b (patch)
tree5bfa6a4f711cfb7a2219b540ea151ee84b40779e /java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
parent37621957a3b97b6372a435e26c4cc4b7c5aa8648 (diff)
parente72d1a07b6c52e3bcc7f099c81a14dab2fadf459 (diff)
downloadlatinime-681f1239688f873c1ed0cd4e9e35fea598af965b.tar.gz
latinime-681f1239688f873c1ed0cd4e9e35fea598af965b.tar.xz
latinime-681f1239688f873c1ed0cd4e9e35fea598af965b.zip
am e72d1a07: Merge "Allow downloadable dictionaries in development builds"
* commit 'e72d1a07b6c52e3bcc7f099c81a14dab2fadf459': Allow downloadable dictionaries in development builds
Diffstat (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java16
1 files changed, 6 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
index 98eadcacb..272f36e4f 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
@@ -290,16 +290,12 @@ final class BinaryDictionaryGetter {
final Context context) {
final boolean hasDefaultWordList = DictionaryFactory.isDictionaryAvailable(context, locale);
- // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
- // Service yet
- if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
- // We need internet access to do the following. Only do this if the package actually
- // has the permission.
- if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET)
- == PackageManager.PERMISSION_GRANTED) {
- BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
- hasDefaultWordList);
- }
+ // We need internet access to do the following. Only do this if the package actually
+ // has the permission.
+ if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET)
+ == PackageManager.PERMISSION_GRANTED) {
+ BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
+ hasDefaultWordList);
}
final File[] cachedWordLists = getCachedWordLists(locale.toString(), context);
final String mainDictId = DictionaryInfoUtils.getMainDictId(locale);