Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-24 17:42:03 +00:00
committed by Android (Google) Code Review
parent 8829c37c1d 13885b73dd
commit 78243297c0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ActivityThread.java
View File

@@ -201,6 +201,7 @@ import java.lang.reflect.Method;
import java.net.InetAddress;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -7413,8 +7414,10 @@ public final class ActivityThread extends ClientTransactionHandler {
if (e.errno == OsConstants.EXDEV && oldPath.startsWith("/storage/")) {
Log.v(TAG, "Recovering failed rename " + oldPath + " to " + newPath);
try {
Files.move(new File(oldPath).toPath(), new File(newPath).toPath());
Files.move(new File(oldPath).toPath(), new File(newPath).toPath(),
StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e2) {
Log.e(TAG, "Rename recovery failed ", e);
throw e;
}
} else {