commit 1851db6804cbdf8d2c8ede0725e73be6fda0f3c0
author Marco Nelissen <marcone@google.com> Mon Sep 28 09:03:33 2009 -0700
committer Marco Nelissen <marcone@google.com> Mon Sep 28 09:03:33 2009 -0700
tree 6a60957cfa389329faad054e53526013aab5469d
parent d4f3586c93cd9c29056e95cd79f3cb19ac456f3b

Always consider m4a files as audio, even when they contain a video track.

media/java/android/media/MediaScanner.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 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);
         }