diff options
author | Garfield Tan <xutan@google.com> | 2017-07-20 14:51:26 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@google.com> | 2017-07-21 19:54:29 +0000 |
commit | 329a94b7cbaab13f3a046fa0989a9e3eea92cac9 (patch) | |
tree | f6a6a71aeafd20d18ea5809fea7aee464c64a091 /src | |
parent | 221afa48c953769209fca5fca6e8d38e216e3c92 (diff) | |
download | android_packages_providers_DownloadProvider-329a94b7cbaab13f3a046fa0989a9e3eea92cac9.tar.gz android_packages_providers_DownloadProvider-329a94b7cbaab13f3a046fa0989a9e3eea92cac9.tar.bz2 android_packages_providers_DownloadProvider-329a94b7cbaab13f3a046fa0989a9e3eea92cac9.zip |
Move the null check before assigning parentId to root doc ID.
Test: Manual test.
Bug: 63901648
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I28c0abbb13900567b8e6693d11b3c82055205520
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index bbcb06d2..5d817a3d 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -131,7 +131,11 @@ public class DownloadStorageProvider extends FileSystemProvider { } @Override - public Path findDocumentPath(String parentDocId, String docId) throws FileNotFoundException { + public Path findDocumentPath(@Nullable String parentDocId, String docId) throws FileNotFoundException { + + // parentDocId is null if the client is asking for the path to the root of a doc tree. + // Don't share root information with those who shouldn't know it. + final String rootId = (parentDocId == null) ? DOC_ID_ROOT : null; if (parentDocId == null) { parentDocId = DOC_ID_ROOT; @@ -141,8 +145,6 @@ public class DownloadStorageProvider extends FileSystemProvider { final File doc = getFileForDocId(docId); - final String rootId = (parentDocId == null) ? DOC_ID_ROOT : null; - return new Path(rootId, findDocumentPath(parent, doc)); } |