diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2019-02-21 14:00:51 -0800 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2019-02-21 17:07:20 -0800 |
| commit | bc3cdb55f985737f4e64be61403385bddeb43f71 (patch) | |
| tree | d92bfa9255a4bde324b7f011480badbc0ff02a8b /src/com/android | |
| parent | e9d77945f83574d5e600d1d98dd73d6343ac7bef (diff) | |
| download | android_packages_providers_DownloadProvider-bc3cdb55f985737f4e64be61403385bddeb43f71.tar.gz android_packages_providers_DownloadProvider-bc3cdb55f985737f4e64be61403385bddeb43f71.tar.bz2 android_packages_providers_DownloadProvider-bc3cdb55f985737f4e64be61403385bddeb43f71.zip | |
Treat download entries with null mimeType as directories.
Bug: 124337318
Test: manual
Change-Id: Ic0c3d2de51e07923e9d04375329ca7c84cccd88f
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index cd57fe15..0396e612 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -910,11 +910,16 @@ public class DownloadStorageProvider extends FileSystemProvider { private String getMimeType(@NonNull Cursor mediaCursor) { final int format = mediaCursor.getInt(mediaCursor.getColumnIndex( FileColumns.FORMAT)); - // TODO: MediaProvider should be updated to use correct mimeTypes for directories + // TODO: Remove once b/123311895 is fixed. if (format == MtpConstants.FORMAT_ASSOCIATION) { return Document.MIME_TYPE_DIR; } - return mediaCursor.getString(mediaCursor.getColumnIndex(FileColumns.MIME_TYPE)); + final String mimeType = mediaCursor.getString( + mediaCursor.getColumnIndex(FileColumns.MIME_TYPE)); + if (mimeType == null) { + return Document.MIME_TYPE_DIR; + } + return mimeType; } // Copied from MediaDocumentsProvider with some tweaks |