From b394d9a5f8e90486555b820fa1d17a32186d440b Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Wed, 17 Nov 2010 17:55:06 -0800 Subject: Add supported video/m4v mimeType to the support list. This is to support video/m4v mimeType in the Browser. Even though it's not listed in MediaFile.java, it's supported and plays well. issue:3207898 Change-Id: I35c7905527ce2c46f8861662b3a2ee94a690b38e --- core/java/android/webkit/WebViewCore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 9975862982ad..17f0a97d4875 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -285,7 +285,9 @@ final class WebViewCore { int fileType = MediaFile.getFileTypeForMimeType(mimeType); return MediaFile.isAudioFileType(fileType) || MediaFile.isVideoFileType(fileType) - || MediaFile.isPlayListFileType(fileType); + || MediaFile.isPlayListFileType(fileType) + // The following is not in Media framework, but it's supported. + || (mimeType != null && mimeType.startsWith("video/m4v")); } /** -- cgit v1.2.3-59-g8ed1b