From f555b7b8142106a2cac168e5e1f0e487c6317b87 Mon Sep 17 00:00:00 2001
From: Diksha Gohlyan <dikshag@google.com>
Date: Wed, 29 Apr 2020 10:06:03 -0700
Subject: [PATCH] Use visible path for search documents

Test: atest DocumentsUIGoogleTests
Bug: 155139904

Change-Id: I5454c1cc48e2d4489218b5795c98bd0f9526c6ab
---
 .../com/android/externalstorage/ExternalStorageProvider.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index f1ec606243c44..83319cf788c2f 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -577,8 +577,11 @@ public class ExternalStorageProvider extends FileSystemProvider {
     public Cursor querySearchDocuments(String rootId, String[] projection, Bundle queryArgs)
             throws FileNotFoundException {
         final File parent;
+
         synchronized (mRootsLock) {
-            parent = mRoots.get(rootId).path;
+            RootInfo root = mRoots.get(rootId);
+            parent = root.visiblePath != null ? root.visiblePath
+                : root.path;
         }
 
         return querySearchDocuments(parent, projection, Collections.emptySet(), queryArgs);