Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146

Change-Id: If2115b152fb5242430e4645d224990f95b912bd0
This commit is contained in:
Diksha Gohlyan
2020-06-10 16:08:44 +00:00
committed by Automerger Merge Worker
parent 756d9c1196 e445872013
commit 9ad0db624f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@@ -520,9 +520,11 @@ public class ExternalStorageProvider extends FileSystemProvider {
final RootInfo root = resolvedDocId.first; final RootInfo root = resolvedDocId.first;
File child = resolvedDocId.second; File child = resolvedDocId.second;
final File rootFile = root.visiblePath != null ? root.visiblePath
: root.path;
final File parent = TextUtils.isEmpty(parentDocId) final File parent = TextUtils.isEmpty(parentDocId)
? root.path ? rootFile
: getFileForDocId(parentDocId); : getFileForDocId(parentDocId);
return new Path(parentDocId == null ? root.rootId : null, findDocumentPath(parent, child)); return new Path(parentDocId == null ? root.rootId : null, findDocumentPath(parent, child));
} }