From e808f96a9c51860eb75cad8ba249723057c024ff Mon Sep 17 00:00:00 2001
From: Diksha Gohlyan <dikshag@google.com>
Date: Tue, 9 Jun 2020 16:41:16 -0700
Subject: [PATCH] Use visiblePath instead of path for findDocumentPath

Test: atest DocumentsUIGoogleTests
Bug: 158142289

Change-Id: Id46ac014ad87af052b684e21b9242f762d7db80a
---
 .../android/externalstorage/ExternalStorageProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 8f919c3d86cae..132922a59fc1c 100644
--- 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));
     }