Merge "Use visible path for search documents" into rvc-dev am: 1c90652b28 am: 1221584792 am: fbd997b61e

Change-Id: Iff1d29ab2b5f39e223c30e24ca41d5b3e36e0092

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