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

Commit f8325ec4 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev 

* commit '5cb0560b':
  Access the dictionary pack only if have INTERNET permission
parents 62ed594c 5cb0560b

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

+8 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.inputmethod.latin.makedict.FormatSpec; 


import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.AssetFileDescriptor;

import android.util.Log;
@@ -290,9 +291,14 @@ final class BinaryDictionaryGetter { 
        // list of everything we ever cached, so we ignore the return value.

        // TODO: The experimental version is not supported by the Dictionary Pack Service yet

        if (!ProductionFlag.IS_EXPERIMENTAL) {

            // 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);

        final DictPackSettings dictPackSettings = new DictPackSettings(context);