diff options
| author | Steve Block <steveblock@google.com> | 2011-10-11 14:49:47 +0100 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2011-10-13 15:32:13 -0700 |
| commit | 33f962b22ec4ce30368a1b2847a868205ad6b99b (patch) | |
| tree | 9a38585b400de1768e9cc1400e6bab77acdf84ad /core | |
| parent | ab9d5b11737f8a460467657035186bcfa7085eb9 (diff) | |
| download | frameworks_base-33f962b22ec4ce30368a1b2847a868205ad6b99b.zip frameworks_base-33f962b22ec4ce30368a1b2847a868205ad6b99b.tar.gz frameworks_base-33f962b22ec4ce30368a1b2847a868205ad6b99b.tar.bz2 | |
Improve JavaDoc for WebView.loadData()
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.
Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8da1820..1c22a0b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2079,10 +2079,12 @@ public class WebView extends AbsoluteLayout * <p> * The 'data' scheme URL formed by this method uses the default US-ASCII * charset. If you need need to set a different charset, you should form a - * 'data' scheme URL which specifies a charset parameter and call - * {@link #loadUrl(String)} instead. + * 'data' scheme URL which explicitly specifies a charset parameter in the + * mediatype portion of the URL and call {@link #loadUrl(String)} instead. + * Note that the charset obtained from the mediatype portion of a data URL + * always overrides that specified in the HTML or XML document itself. * @param data A String of data in the given encoding. - * @param mimeType The MIMEType of the data, e.g. 'text/html'. + * @param mimeType The MIME type of the data, e.g. 'text/html'. * @param encoding The encoding of the data. */ public void loadData(String data, String mimeType, String encoding) { |