Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: df420898ba am: 5653bed177

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146

Change-Id: Ic4e2610a51f0b479069aa033e54c4f070f145956

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));
     }