Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev

2020-06-10 15:56:20 +00:00
parent c357f2cafd e808f96a9c
commit e445872013
1 changed files with 4 additions and 2 deletions
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -520,9 +520,11 @@ public class ExternalStorageProvider extends FileSystemProvider {
        final RootInfo root = resolvedDocId.first;
        File child = resolvedDocId.second;

+        final File rootFile = root.visiblePath != null ? root.visiblePath
+                : root.path;
        final File parent = TextUtils.isEmpty(parentDocId)
-                        ? root.path
-                        : getFileForDocId(parentDocId);
+                ? rootFile
+                : getFileForDocId(parentDocId);

        return new Path(parentDocId == null ? root.rootId : null, findDocumentPath(parent, child));
    }