From c9cb80e9e66c334eb82bf94e20a93c5b02719733 Mon Sep 17 00:00:00 2001 From: Bryan Mawhinney Date: Tue, 19 Jul 2016 15:26:09 +0100 Subject: [PATCH] Add .mov to MediaScanner video file types Bug: 16162336 Change-Id: I34467c707494690a9e3e3890f295dd1f7df86c86 --- media/java/android/media/MediaFile.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index f7becf54d3408..da490b9f74976 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -69,8 +69,9 @@ public class MediaFile { // More video file types public static final int FILE_TYPE_MP2PS = 200; + public static final int FILE_TYPE_QT = 201; private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; - private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS; + private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_QT; // Image file types public static final int FILE_TYPE_JPEG = 31; @@ -211,6 +212,8 @@ public class MediaFile { addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG); addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG); addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG); + addFileType("MOV", FILE_TYPE_QT, "video/quicktime", MtpConstants.FORMAT_MPEG); + addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER); addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER); addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);