From 0d1313aaef67af2386b596fbacf7fc6615ec36a0 Mon Sep 17 00:00:00 2001
From: Diksha Gohlyan <dikshag@google.com>
Date: Thu, 23 Apr 2020 08:02:13 -0700
Subject: [PATCH] Prefer visiblePath if available

Test: atest DocumentsUIGoogleTests

Bug: 154502439, 151981237

Change-Id: I85b673d31b2353cf4c65917bb44ef270f2c53128
---
 .../com/android/externalstorage/ExternalStorageProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 617305cf6e5ee..f1ec606243c44 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -433,7 +433,7 @@ public class ExternalStorageProvider extends FileSystemProvider {
         final int splitIndex = docId.indexOf(':', 1);
         final String path = docId.substring(splitIndex + 1);
 
-        File target = visible ? root.visiblePath : root.path;
+        File target = root.visiblePath != null ? root.visiblePath : root.path;
         if (target == null) {
             return null;
         }