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

Commit 5017286a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Fix ExternalStorageProvider always throw exception when rename" am: 8883851c 

am: deb51d84

Change-Id: I4411270b371f25d7a245f163db8d1a358426b6f2
parents 3701764e deb51d84

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

+1 −1
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
        displayName = FileUtils.buildValidFatFilename(displayName);



        final File before = getFileForDocId(docId);

        final File beforeVisibleFile = getFileForDocId(docId, true);

        final File after = FileUtils.buildUniqueFile(before.getParentFile(), displayName);

        if (!before.renameTo(after)) {

            throw new IllegalStateException("Failed to rename to " + after);
@@ -245,7 +246,6 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
        onDocIdChanged(docId);

        onDocIdChanged(afterDocId);



        final File beforeVisibleFile = getFileForDocId(docId, true);

        final File afterVisibleFile = getFileForDocId(afterDocId, true);

        moveInMediaStore(beforeVisibleFile, afterVisibleFile);