diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-22 12:45:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-22 12:45:54 -0700 |
| commit | 935269687ba3846e4c1aac912e4c4047e1ea13ed (patch) | |
| tree | 30718c65500887d433458ce275a058be537d4382 | |
| parent | c9533a0e23689000bca615727500eb0612d280a5 (diff) | |
| parent | 169ab531ca6bb2f43ed18fe2b03f66c808f12b81 (diff) | |
| download | android_packages_providers_DownloadProvider-935269687ba3846e4c1aac912e4c4047e1ea13ed.tar.gz android_packages_providers_DownloadProvider-935269687ba3846e4c1aac912e4c4047e1ea13ed.tar.bz2 android_packages_providers_DownloadProvider-935269687ba3846e4c1aac912e4c4047e1ea13ed.zip | |
am 169ab531: Bring back DRM mimetypes.
* commit '169ab531ca6bb2f43ed18fe2b03f66c808f12b81':
Bring back DRM mimetypes.
| -rw-r--r-- | src/com/android/providers/downloads/OpenHelper.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java index 356375b8..7eca95c9 100644 --- a/src/com/android/providers/downloads/OpenHelper.java +++ b/src/com/android/providers/downloads/OpenHelper.java @@ -16,6 +16,7 @@ package com.android.providers.downloads; +import static android.app.DownloadManager.COLUMN_LOCAL_FILENAME; import static android.app.DownloadManager.COLUMN_LOCAL_URI; import static android.app.DownloadManager.COLUMN_MEDIA_TYPE; import static android.app.DownloadManager.COLUMN_URI; @@ -46,7 +47,9 @@ public class OpenHelper { } final Uri localUri = getCursorUri(cursor, COLUMN_LOCAL_URI); - final String mimeType = getCursorString(cursor, COLUMN_MEDIA_TYPE); + final String filename = getCursorString(cursor, COLUMN_LOCAL_FILENAME); + String mimeType = getCursorString(cursor, COLUMN_MEDIA_TYPE); + mimeType = DownloadDrmHelper.getOriginalMimeType(context, filename, mimeType); final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); |