Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev (881bc352) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaFile.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,8 +69,9 @@ public class MediaFile {

	// More video file types		// More video file types
	public static final int FILE_TYPE_MP2PS = 200;		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 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		// Image file types
	public static final int FILE_TYPE_JPEG = 31;		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("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
	addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG);		addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG);
	addFileType("M4V", FILE_TYPE_M4V, "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("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
	addFileType("3GPP", 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);		addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);