summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2012-04-03 08:37:07 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-04-03 08:37:07 -0700
commit4a727e342134f409c2cf7cf2f77dbe9c15128337 (patch)
tree7ba8718a00d7fc3729f92d6317374bc090997a6f
parent1cd5f0d42b99e91b2acac4fc414fd1d69d110a9e (diff)
parentdc912ed9c6f1a0812bd07e5a24600c5b438a54bb (diff)
Merge "Support audio/ogg mimetype"
-rw-r--r--media/java/android/media/MediaFile.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index 7f7e284cda8e..c9bec1814278 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -179,6 +179,7 @@ public class MediaFile {
if (isWMAEnabled()) {
addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma", MtpConstants.FORMAT_WMA);
}
+ addFileType("OGG", FILE_TYPE_OGG, "audio/ogg", MtpConstants.FORMAT_OGG);
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);