diff options
author | Sudheer Shanka <sudheersai@google.com> | 2019-05-14 09:21:28 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-14 09:21:28 -0700 |
commit | 254ca48681331e5ae531e184d13df2d624dcd37d (patch) | |
tree | 31d04cdfb605f460114216fd919f77870bc179d9 | |
parent | 1a51e93e7e816ce0844fa5fbbf79c779cc80de35 (diff) | |
parent | d79866aadd52570901ad49a2d73097e7878fef31 (diff) | |
download | android_packages_providers_DownloadProvider-254ca48681331e5ae531e184d13df2d624dcd37d.tar.gz android_packages_providers_DownloadProvider-254ca48681331e5ae531e184d13df2d624dcd37d.tar.bz2 android_packages_providers_DownloadProvider-254ca48681331e5ae531e184d13df2d624dcd37d.zip |
Allow files to be created under download dirs from MediaStore.
am: d79866aadd
Change-Id: I60e28e1e25a085c1615e894bc2558a48c14d1fb4
-rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index df073cdc..171bdd3d 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -198,7 +198,8 @@ public class DownloadStorageProvider extends FileSystemProvider { try { String newDocumentId = super.createDocument(parentDocId, mimeType, displayName); if (!Document.MIME_TYPE_DIR.equals(mimeType) - && !RawDocumentsHelper.isRawDocId(parentDocId)) { + && !RawDocumentsHelper.isRawDocId(parentDocId) + && !isMediaStoreDownload(parentDocId)) { File newFile = getFileForDocId(newDocumentId); newDocumentId = Long.toString(mDm.addCompletedDownload( newFile.getName(), newFile.getName(), true, mimeType, @@ -243,7 +244,8 @@ public class DownloadStorageProvider extends FileSystemProvider { final long token = Binder.clearCallingIdentity(); try { - if (RawDocumentsHelper.isRawDocId(docId)) { + if (RawDocumentsHelper.isRawDocId(docId) + || isMediaStoreDownloadDir(docId)) { return super.renameDocument(docId, displayName); } @@ -925,7 +927,10 @@ public class DownloadStorageProvider extends FileSystemProvider { mediaCursor.getColumnIndex(DownloadColumns.IS_PENDING)) == 1; int extraFlags = isPending ? Document.FLAG_PARTIAL : 0; - if (!Document.MIME_TYPE_DIR.equals(mimeType)) { + if (Document.MIME_TYPE_DIR.equals(mimeType)) { + extraFlags |= Document.FLAG_DIR_SUPPORTS_CREATE; + } + if (!isPending) { extraFlags |= Document.FLAG_SUPPORTS_RENAME; } |