summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2011-10-10 14:09:44 +0100
committer Steve Block <steveblock@google.com> 2011-10-10 16:57:05 +0100
commitb19c7878cc48746b7dda7ebdf1c85f6a7e6996a3 (patch)
tree0e3cebb0752e9804e3b84a68bd6cc0412b3e30a6
parentbdb3df82bb800de6f86de6b5bb2a4d29e09b3383 (diff)
Improve documentation for WebView.loadUrl() to specify charset
Bug: 5435233 Change-Id: I69a8e0c551b58f284cfa95dccfc0ea49b0bbf05f
-rw-r--r--core/java/android/webkit/WebView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 05d8da221d34..f46af5137661 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2075,6 +2075,11 @@ public class WebView extends AbsoluteLayout
* be encoded as base64. Otherwise, the data must use ASCII encoding for
* octets inside the range of safe URL characters and use the standard %xx
* hex encoding of URLs for octets outside that range.
+ * <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.
* @param data A String of data in the given encoding.
* @param mimeType The MIMEType of the data, e.g. 'text/html'.
* @param encoding The encoding of the data.