diff options
Diffstat (limited to 'media/java/android')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 4 | ||||
| -rw-r--r-- | media/java/android/media/ToneGenerator.java | 2 |
2 files changed, 4 insertions, 2 deletions
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); diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index 05e4471..08c49e7 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -739,7 +739,7 @@ public class ToneGenerator * * @hide #ToneGenerator(int, int) */ - public static final int TONE_HOLD_RECALL = 101; + public static final int TONE_HOLD_RECALL = 99; /** Maximum volume, for use with {@link #ToneGenerator(int,int)} */ public static final int MAX_VOLUME = 100; |