diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-11-17 17:55:06 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-11-18 10:53:07 -0800 |
| commit | b394d9a5f8e90486555b820fa1d17a32186d440b (patch) | |
| tree | c47d26ac049fd40b63b6acf8ea03e8707a3a459d /core | |
| parent | 7200ab4a8f61b4aed25f9536ae29051e02503563 (diff) | |
| download | frameworks_base-b394d9a5f8e90486555b820fa1d17a32186d440b.zip frameworks_base-b394d9a5f8e90486555b820fa1d17a32186d440b.tar.gz frameworks_base-b394d9a5f8e90486555b820fa1d17a32186d440b.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 9975862..17f0a97 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")); } /** |