summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-07-22 16:52:12 +0100
committerBen Murdoch <benm@google.com>2013-07-23 15:15:21 +0100
commit597256e12825359d6e89cccb5a4b9a89ce4ff7a3 (patch)
treefbb4efa9d1c5922800099a0d53bb3e7376a77a9b /core/java/android/webkit
parentd1233575b558d3dc585f7e04ff1377c24f3beaf4 (diff)
downloadframeworks_base-597256e12825359d6e89cccb5a4b9a89ce4ff7a3.zip
frameworks_base-597256e12825359d6e89cccb5a4b9a89ce4ff7a3.tar.gz
frameworks_base-597256e12825359d6e89cccb5a4b9a89ce4ff7a3.tar.bz2
Update WebView.loadDataWithBaseURL documentation.
Clarify behavior around base URLs with data: vs. non-data: schemes. Bug: 9894754 Change-Id: I335253c07a13f3d4a5485b6ff11e53bd1580a890
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/WebView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 7146d0d..79b952f 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -832,7 +832,10 @@ public class WebView extends AbsoluteLayout
* <p>
* If the base URL uses the data scheme, this method is equivalent to
* calling {@link #loadData(String,String,String) loadData()} and the
- * historyUrl is ignored.
+ * historyUrl is ignored, and the data will be treated as part of a data: URL.
+ * If the base URL uses any other scheme, then the data will be loaded into
+ * the WebView as a plain string (i.e. not part of a data URL) and any URL-encoded
+ * entities in the string will not be decoded.
*
* @param baseUrl the URL to use as the page's base URL. If null defaults to
* 'about:blank'.