commit 8883851c7149879989391e259cb6c24132976c5d
author Jeff Sharkey <jsharkey@android.com> Wed Sep 26 16:27:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 16:27:24 2018 +0000
tree d151c954ce0d0567b06118c0e0a22e0bcd4fb00d
parent c457d8c95ac06f5a37a6a766f06005827a454a9e
parent ac4559936471ba7d4bc03f4cdc5763b91ed3384e

Merge "Fix ExternalStorageProvider always throw exception when rename"

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

diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java
index b591163..f90eab1 100644
--- a/core/java/com/android/internal/content/FileSystemProvider.java
+++ b/core/java/com/android/internal/content/FileSystemProvider.java
@@ -236,6 +236,7 @@
         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 @@
         onDocIdChanged(docId);
         onDocIdChanged(afterDocId);
 
-        final File beforeVisibleFile = getFileForDocId(docId, true);
         final File afterVisibleFile = getFileForDocId(afterDocId, true);
         moveInMediaStore(beforeVisibleFile, afterVisibleFile);