Merge "Support audio/ogg mimetype"

marcone · Android (Google) Code Review · commit 4a727e342134 · 2012-04-03T08:37:07.000-07:00
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
@@ -179,6 +179,7 @@ private static boolean isWMVEnabled() {
         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);

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ private static boolean isWMVEnabled() {`
`179`	`179`	`if (isWMAEnabled()) {`
`180`	`180`	`addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma", MtpConstants.FORMAT_WMA);`
`181`	`181`	`}`
	`182`	`+ addFileType("OGG", FILE_TYPE_OGG, "audio/ogg", MtpConstants.FORMAT_OGG);`
`182`	`183`	`addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);`
`183`	`184`	`addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);`
`184`	`185`	`addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC);`