Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8883851c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Gerrit Code Review
Browse files

Merge "Fix ExternalStorageProvider always throw exception when rename"

parents c457d8c9 ac455993

core/java/com/android/internal/content/FileSystemProvider.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);