Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME

1 files changed, 0 insertions, 50 deletions

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFactory.java b/java/src/com/android/inputmethod/latin/DictionaryFactory.java
index e09c309ea..828e54f14 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFactory.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFactory.java
@@ -16,7 +16,6 @@
 
 package com.android.inputmethod.latin;
 
-import android.content.ContentProviderClient;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
@@ -65,10 +64,6 @@ public final class DictionaryFactory {
                                 useFullEditDistance, locale, Dictionary.TYPE_MAIN);
                 if (readOnlyBinaryDictionary.isValidDictionary()) {
                     dictList.add(readOnlyBinaryDictionary);
-                } else {
-                    readOnlyBinaryDictionary.close();
-                    // Prevent this dictionary to do any further harm.
-                    killDictionary(context, f);
                 }
             }
         }
@@ -80,51 +75,6 @@ public final class DictionaryFactory {
     }
 
     /**
-     * Kills a dictionary so that it is never used again, if possible.
-     * @param context The context to contact the dictionary provider, if possible.
-     * @param f A file address to the dictionary to kill.
-     */
-    private static void killDictionary(final Context context, final AssetFileAddress f) {
-        if (f.pointsToPhysicalFile()) {
-            f.deleteUnderlyingFile();
-            // Warn the dictionary provider if the dictionary came from there.
-            final ContentProviderClient providerClient;
-            try {
-                providerClient = context.getContentResolver().acquireContentProviderClient(
-                        BinaryDictionaryFileDumper.getProviderUriBuilder("").build());
-            } catch (final SecurityException e) {
-                Log.e(TAG, "No permission to communicate with the dictionary provider", e);
-                return;
-            }
-            if (null == providerClient) {
-                Log.e(TAG, "Can't establish communication with the dictionary provider");
-                return;
-            }
-            final String wordlistId =
-                    DictionaryInfoUtils.getWordListIdFromFileName(new File(f.mFilename).getName());
-            if (null != wordlistId) {
-                // TODO: this is a reasonable last resort, but it is suboptimal.
-                // The following will remove the entry for this dictionary with the dictionary
-                // provider. When the metadata is downloaded again, we will try downloading it
-                // again.
-                // However, in the practice that will mean the user will find themselves without
-                // the new dictionary. That's fine for languages where it's included in the APK,
-                // but for other languages it will leave the user without a dictionary at all until
-                // the next update, which may be a few days away.
-                // Ideally, we would trigger a new download right away, and use increasing retry
-                // delays for this particular id/version combination.
-                // Then again, this is expected to only ever happen in case of human mistake. If
-                // the wrong file is on the server, the following is still doing the right thing.
-                // If it's a file left over from the last version however, it's not great.
-                BinaryDictionaryFileDumper.reportBrokenFileToDictionaryProvider(
-                        providerClient,
-                        context.getString(R.string.dictionary_pack_client_id),
-                        wordlistId);
-            }
-        }
-    }
-
-    /**
      * Initializes a main dictionary collection from a dictionary pack, with default flags.
      *
      * This searches for a content provider providing a dictionary pack for the specified