aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-07-13 16:46:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 16:46:24 +0000
commit0564deb185675b53081befffe48ccac9a0b4dcca (patch)
tree70dfa898cfb2b9ea89b0d6515d3006dfd8219304 /java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
parent87c8e92deaad8f10304f801224a6f9fe4400e879 (diff)
parent741b6acbf88e0a08703fdab295fc2697adf6c1c6 (diff)
downloadlatinime-0564deb185675b53081befffe48ccac9a0b4dcca.tar.gz
latinime-0564deb185675b53081befffe48ccac9a0b4dcca.tar.xz
latinime-0564deb185675b53081befffe48ccac9a0b4dcca.zip
am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6': 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.java8
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)) {