From 280b65c572bfa7842d897bc654e84b7c81e9c92d Mon Sep 17 00:00:00 2001 From: Paramananda Pradhan Date: Tue, 15 Dec 2015 17:36:28 +0530 Subject: frameworks/base: Added SD type support Added DRM SD type "application/vnd.oma.drm.content" as a supportable DRM media type. CRs-Fixed: 941545 Change-Id: I7c53a3577a2044fb2d83ee7de3a7f1a3e625412e --- media/java/android/media/MediaFile.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index e91548c..c6de463 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -108,8 +108,9 @@ public class MediaFile { // Drm file types public static final int FILE_TYPE_FL = 51; + public static final int FILE_TYPE_SD = 52; private static final int FIRST_DRM_FILE_TYPE = FILE_TYPE_FL; - private static final int LAST_DRM_FILE_TYPE = FILE_TYPE_FL; + private static final int LAST_DRM_FILE_TYPE = FILE_TYPE_SD; // Other popular file types public static final int FILE_TYPE_TEXT = 100; @@ -243,6 +244,7 @@ public class MediaFile { addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/x-mpegurl"); addFileType("FL", FILE_TYPE_FL, "application/x-android-drm-fl"); + addFileType("DCF", FILE_TYPE_SD, "application/vnd.oma.drm.content"); addFileType("TXT", FILE_TYPE_TEXT, "text/plain", MtpConstants.FORMAT_TEXT); addFileType("HTM", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML); -- cgit v1.1