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

Merge "Fix ExternalStorageProvider always throw exception when rename"

Browse Source 
am: 8883851c71

Change-Id: I8c11434930de7f3f51fae6ca4666f1a00a265e64
This commit is contained in:
Jeff Sharkey
2018-09-26 09:44:52 -07:00
committed by android-build-merger
parent 1f30b816d8 8883851c71
commit deb51d8489
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/content/FileSystemProvider.java
View File

@@ -236,6 +236,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
displayName = FileUtils.buildValidFatFilename(displayName); displayName = FileUtils.buildValidFatFilename(displayName);
final File before = getFileForDocId(docId); final File before = getFileForDocId(docId);
final File beforeVisibleFile = getFileForDocId(docId, true);
final File after = FileUtils.buildUniqueFile(before.getParentFile(), displayName); final File after = FileUtils.buildUniqueFile(before.getParentFile(), displayName);
if (!before.renameTo(after)) { if (!before.renameTo(after)) {
throw new IllegalStateException("Failed to rename to " + after); throw new IllegalStateException("Failed to rename to " + after);
@@ -245,7 +246,6 @@ public abstract class FileSystemProvider extends DocumentsProvider {
onDocIdChanged(docId); onDocIdChanged(docId);
onDocIdChanged(afterDocId); onDocIdChanged(afterDocId);
final File beforeVisibleFile = getFileForDocId(docId, true);
final File afterVisibleFile = getFileForDocId(afterDocId, true); final File afterVisibleFile = getFileForDocId(afterDocId, true);
moveInMediaStore(beforeVisibleFile, afterVisibleFile); moveInMediaStore(beforeVisibleFile, afterVisibleFile);