Merge "Prefer visiblePath if available" into rvc-dev am: d29f648347 am: 8dd835563d am: 9c74891698

Change-Id: I88ca2f90a8a0bd794b4b2982c690eed69d76e304
2020-04-23 21:49:43 +00:00
parent 67b12b181d 9c74891698
commit 87926019af
1 changed files with 1 additions and 1 deletions
--- 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;
        }