diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-07-11 01:28:18 -0700 |
|---|---|---|
| committer | Jatin Matani <jatinm@google.com> | 2015-07-13 03:01:27 -0700 |
| commit | 0dacfff5d1d4d4a53490a60a554d7d408ecc29b3 (patch) | |
| tree | 5985077d672f970ae18ec435656302e7bb3d3e8d /java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java | |
| parent | 4d7a7780395a2376b566452646d1a241e165c3bf (diff) | |
| parent | d711426a87ed131c527beb8f7a9160daa14d1f94 (diff) | |
| download | latinime-0dacfff5d1d4d4a53490a60a554d7d408ecc29b3.tar.gz latinime-0dacfff5d1d4d4a53490a60a554d7d408ecc29b3.tar.xz latinime-0dacfff5d1d4d4a53490a60a554d7d408ecc29b3.zip | |
resolved conflicts for merge of d711426a to mnc-dr-dev
Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
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)) { |