From 1851db6804cbdf8d2c8ede0725e73be6fda0f3c0 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Mon, 28 Sep 2009 09:03:33 -0700
Subject: Always consider m4a files as audio, even when they contain a video
 track.

---
 media/java/android/media/MediaScanner.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'media/java')

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 3a3ae5f..afdc8f7 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -610,6 +610,13 @@ public class MediaScanner
         }
 
         public void setMimeType(String mimeType) {
+            if ("audio/mp4".equals(mMimeType) &&
+                    mimeType.startsWith("video")) {
+                // for feature parity with Donut, we force m4a files to keep the
+                // audio/mp4 mimetype, even if they are really "enhanced podcasts"
+                // with a video track
+                return;
+            }
             mMimeType = mimeType;
             mFileType = MediaFile.getFileTypeForMimeType(mimeType);
         }
-- 
cgit v1.1