Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33f962b2 authored by Steve Block's avatar Steve Block Committed by Bart Sears
Browse files

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
parent ab9d5b11

core/java/android/webkit/WebView.java

+5 −3
Original line number Diff line number Diff line
@@ -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) {