diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-11-18 10:55:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-18 10:55:08 -0800 |
| commit | 7fc7d2b9da2057491e41d530847ed269e0a89771 (patch) | |
| tree | 75e1bf0dfe6270cff46181ea012cfc4eca2fcca2 | |
| parent | 8b8914b50d36734305d582485fa839b7d04b8872 (diff) | |
| parent | b394d9a5f8e90486555b820fa1d17a32186d440b (diff) | |
| download | frameworks_base-7fc7d2b9da2057491e41d530847ed269e0a89771.zip frameworks_base-7fc7d2b9da2057491e41d530847ed269e0a89771.tar.gz frameworks_base-7fc7d2b9da2057491e41d530847ed269e0a89771.tar.bz2 | |
Merge "Add supported video/m4v mimeType to the support list."
| -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")); } /** |