| 0fa72ef10e08e35c28176837c733bd085b17e0ff |
|
27-Mar-2012 |
Jonathan Dixon <joth@google.com> |
Tidy up usage of URLUtil constants
Several of these are duplicated; referring to a single source makes the code
paths using them easier to track down.
(also removing a spurious import)
Bug: 6237833
Change-Id: Ibdacc124c047e37c7f0ced9ecc6f26ae3e6b4326
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 1870015932895244e668a85fb4100632ac949cc3 |
|
14-Dec-2010 |
Ben Murdoch <benm@google.com> |
Remove fragment as well as the query from URLs when resolving MIME type
When we try to deduce the MIME type from the file extension of
a URL, strip the fragment off at the same time we are stripping
the query. Otherwise we end up trying to match against some
funny extensions.
Bug:3241908
Change-Id: Ibaa84f0a628f37cd012b6cfbed9a6a666ecae8bb
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| d77f9b7b3901a93521068ffda53200d3a4233de7 |
|
18-Oct-2010 |
Iain Merrick <husky@google.com> |
Implement file downloads for Chrome HTTP stack (Java side)
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.
See matching C++ change in external/webkit (I81300400)
Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 0f11696164e1dadd2d33dddeca418f719f26bc10 |
|
02-Aug-2010 |
Elliott Hughes <enh@google.com> |
Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table.
(Said table is the very same data that used to be, but pushed further down
the dependencies so that it can be shared with java.net.URLConnection, so
the two classes' equivalent methods return the same results.)
Bug: 2422917
Bug: http://code.google.com/p/android/issues/detail?id=10100
Change-Id: Ic4e80c2fede22671e825d569f349e4329dcf01ea
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| b48fdbe79260b1603cfef5e304e068c29d4bc257 |
|
30-Jun-2010 |
Elliott Slaughter <eds@google.com> |
Browser save page as web archive.
Change-Id: Id34a93b2e9bb6c185338989d1eeb6929d0bd06c5
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| c08fd46f5c557a5ec0b20af115488593c5ee5f98 |
|
09-Jun-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
|
| e00c5ca4318dc886b20621ac1562ee0ab676e451 |
|
18-Feb-2010 |
Henrik Baard <henrik.baard@sonyericsson.com> |
Adding mimetypes to the mimetype map used in the web view
Sometimes a web server reports a faulty mime type, usually when the mimetype for this
type of content is not configured on the server. In this case the server might report
text/plain as the mime type.
When this ocurrs the phone opens this content as plain text inline in the browser instead
of asking system if this is supported by any application.
This is the case for the following mime types:
"XMF" which MIMEtype is "audio/midi"
"MXMF" which MIMEtype is "audio/mobile-xmf"
"AMR" which MIMEtype is "audio/amr"
By adding these MimeTypes to the lookup table in the browser it is possible to guess the
real mime type based on the file extension, and asks the system for support for the
mimtype in the table, fixing the problem.
Change-Id: I88bb37e4a6d66e68d7e26cb96bb9404175b33b68
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| f78964490d8098387d51444c87bf520ad3f674e2 |
|
06-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
|
| f19670ac8637e80a09aed3183072f9ec989028c9 |
|
02-May-2010 |
Melanie Clements <melanielc@google.com> |
Fix for bug 2467152 files with spaces fail to open.
from http://code.google.com/p/android/issues/detail?id=4638
If you try to use a WebView to open an image (of any type)
that is stored in your project's assets/ directory the image
will be written to the screen as text (instead of drawn as
an image) if the filename contains a space.
The problem stems from MimeTypeMap, which determines the
file type from the url. Spaces, represented as '%20'
are not included in the list of acceptable characters for
an image file name, causing the image to be treated as plain
text. I am remedying this by adding '%' to the list.
Change-Id: I29e3da57f3cdaa63ed60b1e6977ba62a0dd108e5
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| c9048a683dee6b062c74b5c88292d063714048a1 |
|
25-Mar-2010 |
Patrick Scott <phanna@android.com> |
Add .3gpp as the preferred extension for video/3gpp.
As it appears earlier in the list, .3gpp will be used as the extension for
video/3gpp mime types.
Bug: 2542939
Change-Id: I7d9188b460774af7bc29f4e8f1ebada43bf2ed10
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 1b098a685255413d3111fbe0b728ef9d3a702a58 |
|
18-Feb-2010 |
Cary Clark <cary@android.com> |
add support for audio/3gpp
This parallels an entry in WebCore/platform/MIMETypeRegistry.cpp
http://b/2452889
http://code.google.com/p/android/issues/detail?id=3728
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 021b7b443fa4bb24ec73d0c09cf019c14eba67bc |
|
13-Jan-2010 |
Patrick Scott <phanna@android.com> |
Add a static method to obtain the mime type from extension.
This method is used by WebKit to obtain the mime type from an extension.
Bug: 2368893
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 208360b22db7bdd940a7005fd44135e8916742af |
|
13-Oct-2009 |
Ben Murdoch <benm@google.com> |
Fix for b/2164520: Download manager should handle video/m4v MIME type.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified.
Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 3905e87e906044e7bdab31041ef13c86a74c1d85 |
|
16-Oct-2009 |
Marc Blank <mblank@google.com> |
Add htm and html extensions to the map as "text/html"
* Fixes #2192935
* Exchange attachment handling depends on MimeTypeMap to determine the
mime type of attachments based on their file extension
Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 6585fe004ed4db12661a934f874390ca4b1e79a4 |
|
28-Sep-2009 |
Andrew Stadler <stadler@android.com> |
Add extension->mime type mappings
* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"
Note: We already had a definition for .pot to text/plain. Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.
Addresses bug # 2097457
Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| ce4105002310a22e104d29d56913cbca9cd485be |
|
30-Jul-2009 |
Android Git Automerger <android-git-automerger@android.com> |
resolved conflicts for merge of 4d4229e4 to master
|
| fd3db87e28e5b9ed186a15944234f6ff520773c6 |
|
28-Jul-2009 |
Chung-yih Wang <cywang@google.com> |
Support x509-user-cert mime type in browser.
+ Fix the public key matching and intent parameter mismatch.
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 9f61732e9b5c146d95a0b157da806d58948f81a5 |
|
21-Jul-2009 |
Patrick Scott <phanna@android.com> |
Add text extensions to the extension mime type map.
The Browser used to have a concern around mapping text extensions to various
text/* mime types. If a text extension mapped to an unknown text/* mime type,
the Browser would attempt to download a url instead of just displaying the
content.
There is another change in external/webkit that uses 2 static functions in
DOMImplementation that determine if a mime type is text or xml. The text
function in particular checks for a leading "text/" string in the mime type.
With that change, pruning text mime types is no longer needed.
Bug: 1988375
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| d7f2036aaa9f934893703d4314d355aef3ffadcb |
|
15-Jul-2009 |
Grace Kloba <klobag@google.com> |
resolved conflicts for merge of 21d769da to master
|
| f8ddc988dc2d9be2f75e0b0d9aa234dad7c8258d |
|
15-Jul-2009 |
Grace Kloba <klobag@google.com> |
Fix #1976384. Add p12 to the MimeTypeMap. When downloading p12 in the WebView, send it to the certTool.
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| f0c70a83562a27c424554f609eb1d4cdebf06df4 |
|
28-Apr-2009 |
Patrick Scott <phanna@android.com> |
Treat application/xhtml+xml as xhtml+xml instead of text/html.
Previously we had converted application/xhtml+xml to text/html because of bad
server data. Now we need to treat xhtml as xhtml to get svg to be interpreted
correctly.
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 105925376f8d0f6b318c9938c7b83ef7fef094da |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 9266c558bf1d21ff647525ff99f7dadbca417309 |
|
16-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@126645
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/java/android/webkit/MimeTypeMap.java
|