diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-07-10 23:24:27 -0700 |
|---|---|---|
| committer | Jatin Matani <jatinm@google.com> | 2015-07-11 00:01:30 -0700 |
| commit | c96aef2283fb7c091c8b35071ab82d3f330c025d (patch) | |
| tree | 22d2104175f6afc9c308a86a114066a1f0363964 /java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java | |
| parent | 5fd77e2ce94e555b06665f9ab636674669c6c6a9 (diff) | |
| parent | d711426a87ed131c527beb8f7a9160daa14d1f94 (diff) | |
| download | latinime-c96aef2283fb7c091c8b35071ab82d3f330c025d.tar.gz latinime-c96aef2283fb7c091c8b35071ab82d3f330c025d.tar.xz latinime-c96aef2283fb7c091c8b35071ab82d3f330c025d.zip | |
resolved conflicts for merge of d711426a to mnc-dev-plus-aosp
Change-Id: I3d92549eb41e4f28d141bb1c218e56a8075edb1f
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..381d7f4f7 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -27,6 +27,7 @@ import android.os.RemoteException; import android.text.TextUtils; import android.util.Log; +import com.android.inputmethod.latin.common.FileUtils; import com.android.inputmethod.dictionarypack.DictionaryPackConstants; import com.android.inputmethod.dictionarypack.MD5Calculator; import com.android.inputmethod.latin.define.DecoderSpecificConstants; @@ -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)) { |