From 27f3e32ee181ccd809fbe74ec5f7fb43aea197f7 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 23 Jul 2012 10:45:59 +0100 Subject: [PATCH] Clarify JavaDoc for WebView.loadData() Bug: 5461416 Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710 --- core/java/android/webkit/WebView.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 6e4e82c85af97..63a79e46706d0 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -801,11 +801,13 @@ public class WebView extends AbsoluteLayout * #loadDataWithBaseURL(String,String,String,String,String) * loadDataWithBaseURL()} with an appropriate base URL. *

- * If the value of the encoding parameter is 'base64', then the data must - * be encoded as base64. Otherwise, the data must use ASCII encoding for + * The encoding parameter specifies whether the data is base64 or URL + * encoded. If the data is base64 encoded, the value of the encoding + * parameter must be 'base64'. For all other values of the parameter, + * including null, it is assumed that the data uses 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. For example, - * '#', '%', '\', '?' should be replaced by %23, %25, %27, %3f respectively. + * hex encoding of URLs for octets outside that range. For example, '#', + * '%', '\', '?' should be replaced by %23, %25, %27, %3f respectively. *

* 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