summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-19 14:42:24 -0700
committerJeff Sharkey <jsharkey@android.com>2012-10-19 14:42:24 -0700
commit169ab531ca6bb2f43ed18fe2b03f66c808f12b81 (patch)
treee676485478341ddce296092ad2bfdf77ea7f622e
parent7444bae122a6f0922792813c6200fe135b4daaa3 (diff)
downloadandroid_packages_providers_DownloadProvider-169ab531ca6bb2f43ed18fe2b03f66c808f12b81.tar.gz
android_packages_providers_DownloadProvider-169ab531ca6bb2f43ed18fe2b03f66c808f12b81.tar.bz2
android_packages_providers_DownloadProvider-169ab531ca6bb2f43ed18fe2b03f66c808f12b81.zip
Bring back DRM mimetypes.
I don't like DRM, but other people do. Bug: 7370549 Change-Id: I44220404eab6e6cc85ea16cfcf58474135c03f83
-rw-r--r--src/com/android/providers/downloads/OpenHelper.java5
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);