Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d973514 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27449 into eclair

* changes:
  Always consider m4a files as audio, even when they contain a video track.
parents c18b0ebc 1851db68
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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);
        }