commit e808f96a9c51860eb75cad8ba249723057c024ff
author Diksha Gohlyan <dikshag@google.com> Tue Jun 09 16:41:16 2020 -0700
committer Diksha Gohlyan <dikshag@google.com> Tue Jun 09 16:42:32 2020 -0700
tree 74dd02bbe00a943f4ef5681cb5f955cbd6b220c7
parent a8e808221e1c6edc4a2fa4e21e1e4e2f7a68d52c

Use visiblePath instead of path for findDocumentPath

Test: atest DocumentsUIGoogleTests
Bug: 158142289

Change-Id: Id46ac014ad87af052b684e21b9242f762d7db80a

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 8f919c3..132922a 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -520,9 +520,11 @@
         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));
     }