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

Merge "Limit rename() workaround to /storage/emulated." into rvc-dev am: 5019f6c50b

Browse Source 
Change-Id: If0679cd07ffc1211573c36b2ef9cb5c464ce0c64
This commit is contained in:
Martijn Coenen
2020-05-12 15:15:28 +00:00
committed by Automerger Merge Worker
parent d0772d278e 5019f6c50b
commit 24508819d3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7513,7 +7513,15 @@ public final class ActivityThread extends ClientTransactionHandler {
try {
super.rename(oldPath, newPath);
} catch (ErrnoException e) {
if (e.errno == OsConstants.EXDEV && oldPath.startsWith("/storage/")) {
// On emulated volumes, we have bind mounts for /Android/data and
// /Android/obb, which prevents move from working across those directories
// and other directories on the filesystem. To work around that, try to
// recover by doing a copy instead.
// Note that we only do this for "/storage/emulated", because public volumes
// don't have these bind mounts, neither do private volumes that are not
// the primary storage.
if (e.errno == OsConstants.EXDEV && oldPath.startsWith("/storage/emulated")
&& newPath.startsWith("/storage/emulated")) {
Log.v(TAG, "Recovering failed rename " + oldPath + " to " + newPath);
try {
Files.move(new File(oldPath).toPath(), new File(newPath).toPath(),