diff options
| author | Diksha Gohlyan <dikshag@google.com> | 2020-06-10 17:14:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 17:14:49 +0000 |
| commit | 27ae63d0383c7a7003f2dbc57e726a2ffbad22cc (patch) | |
| tree | 0255187f3aa0bc22d0a4ebaab4eba95fd17d1020 /packages/ExternalStorageProvider | |
| parent | 29fb75aa6078cc8ead33596ef40dd5429c7e4725 (diff) | |
| parent | 5653bed177a49310c27e2423fe938d80e033dcea (diff) | |
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: df420898ba am: 5653bed177
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Ic4e2610a51f0b479069aa033e54c4f070f145956
Diffstat (limited to 'packages/ExternalStorageProvider')
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 8f919c3d86ca..132922a59fc1 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -520,9 +520,11 @@ public class ExternalStorageProvider extends FileSystemProvider { 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)); } |