diff options
| author |   Qiwen Zhao <zhao@google.com> | 2015-07-13 16:20:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:20:59 +0000 |
| commit | c8edecc5432d8b1d7c487d7a6f3bc6339358afaa (patch) | |
| tree | 5985077d672f970ae18ec435656302e7bb3d3e8d /java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java | |
| parent | 4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e (diff) | |
| parent | 32afc638e9aed9a80cd25d0884406b7394a6ac60 (diff) | |
| download | latinime-c8edecc5432d8b1d7c487d7a6f3bc6339358afaa.tar.gz latinime-c8edecc5432d8b1d7c487d7a6f3bc6339358afaa.tar.xz latinime-c8edecc5432d8b1d7c487d7a6f3bc6339358afaa.zip | |
am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60':
Remove android.util.Log from FileUtils
Diffstat (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index bc62f3ae3..660e50410 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -29,6 +29,7 @@ import android.util.Log; import com.android.inputmethod.dictionarypack.DictionaryPackConstants; import com.android.inputmethod.dictionarypack.MD5Calculator; +import com.android.inputmethod.latin.common.FileUtils; import com.android.inputmethod.latin.define.DecoderSpecificConstants; import com.android.inputmethod.latin.utils.DictionaryInfoUtils; import com.android.inputmethod.latin.utils.DictionaryInfoUtils.DictionaryInfo; @@ -321,10 +322,11 @@ public final class BinaryDictionaryFileDumper { } final File finalFile = new File(finalFileName); - finalFile.delete(); - if (!outputFile.renameTo(finalFile)) { - throw new IOException("Can't move the file to its final name"); + if (!FileUtils.renameTo(outputFile, finalFile)) { + Log.e(TAG, String.format("Failed to rename from %s to %s.", + outputFile.getAbsoluteFile(), finalFile.getAbsoluteFile())); } + wordListUriBuilder.appendQueryParameter(QUERY_PARAMETER_DELETE_RESULT, QUERY_PARAMETER_SUCCESS); if (0 >= providerClient.delete(wordListUriBuilder.build(), null, null)) { |