diff options
| author | Gloria Wang <gwang@google.com> | 2011-05-19 11:15:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-19 11:15:16 -0700 |
| commit | 612956c914e4dccf7438c0fa13621798fc9ce4fa (patch) | |
| tree | 88649c2a08afca22909e9f3ffeeb841855e7f669 /media | |
| parent | 36cca79ca7d47d06d7fa2500dfd7a726e567eb05 (diff) | |
| parent | f9cf277cda5d7cdf8383331892cca0734a850e19 (diff) | |
| download | frameworks_base-612956c914e4dccf7438c0fa13621798fc9ce4fa.zip frameworks_base-612956c914e4dccf7438c0fa13621798fc9ce4fa.tar.gz frameworks_base-612956c914e4dccf7438c0fa13621798fc9ce4fa.tar.bz2 | |
Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059."
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 352579a..a54cf28 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -176,6 +176,7 @@ public class MediaFile { addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG); addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG); addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC); + addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC); addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska"); addFileType("MID", FILE_TYPE_MID, "audio/midi"); |