diff options
| author | Ben Murdoch <benm@google.com> | 2013-02-25 19:18:19 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-03-01 17:12:16 +0000 |
| commit | 95afb3b11abfdedc4ed6c0e2c39678b58f96b0d9 (patch) | |
| tree | 230e9547ba37015f92cddffb1bb5ccc19cb6f4c6 /core/java/android/webkit/WebView.java | |
| parent | 84ea20d0ba7611782c7aa364cd41744fca359e35 (diff) | |
Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
Trivial cherry pick from master, see
Id1182537e073a9dd7746e23eec20accacedd9fc8
historyURL must be a valid URL.
Bug: 7907196
Change-Id: I1f32a9bda4ae627f242b2533eca18aef3ba25411
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f3983187dc0b..00b00cd672f7 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -856,7 +856,7 @@ public class WebView extends AbsoluteLayout * defaults to 'text/html'. * @param encoding the encoding of the data * @param historyUrl the URL to use as the history entry. If null defaults - * to 'about:blank'. + * to 'about:blank'. If non-null, this must be a valid URL. */ public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) { |