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

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;

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