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

Commit a50a86bb authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by android-build-merger
Browse files

Merge "Clarify WebResourceResponse parameter documentation." into pi-dev am: dfcbdef8

am: 448eb5fd

Change-Id: I215cc7cf98523822adbe2c13e8a2f5891a6f34ec
parents 83103430 448eb5fd
Loading
Loading
Loading
Loading
+17 −6
Original line number Original line Diff line number Diff line
@@ -41,13 +41,21 @@ public class WebResourceResponse {
    private InputStream mInputStream;
    private InputStream mInputStream;


    /**
    /**
     * Constructs a resource response with the given MIME type, encoding, and
     * Constructs a resource response with the given MIME type, character encoding,
     * input stream. Callers must implement
     * and input stream. Callers must implement
     * {@link InputStream#read(byte[]) InputStream.read(byte[])} for the input
     * {@link InputStream#read(byte[]) InputStream.read(byte[])} for the input
     * stream.
     * stream.
     *
     *
     * @param mimeType the resource response's MIME type, for example text/html
     * <p class="note"><b>Note:</b> The MIME type and character encoding must
     * @param encoding the resource response's encoding
     * be specified as separate parameters (for example {@code "text/html"} and
     * {@code "utf-8"}), not a single value like the {@code "text/html; charset=utf-8"}
     * format used in the HTTP Content-Type header. Do not use the value of a HTTP
     * Content-Encoding header for {@code encoding}, as that header does not specify a
     * character encoding. Content without a defined character encoding (for example
     * image resources) should pass {@code null} for {@code encoding}.
     *
     * @param mimeType the resource response's MIME type, for example {@code "text/html"}.
     * @param encoding the resource response's character encoding, for example {@code "utf-8"}.
     * @param data the input stream that provides the resource response's data. Must not be a
     * @param data the input stream that provides the resource response's data. Must not be a
     *             StringBufferInputStream.
     *             StringBufferInputStream.
     */
     */
@@ -63,8 +71,11 @@ public class WebResourceResponse {
     * implement {@link InputStream#read(byte[]) InputStream.read(byte[])} for
     * implement {@link InputStream#read(byte[]) InputStream.read(byte[])} for
     * the input stream.
     * the input stream.
     *
     *
     * @param mimeType the resource response's MIME type, for example text/html
     * <p class="note"><b>Note:</b> See {@link #WebResourceResponse(String,String,InputStream)}
     * @param encoding the resource response's encoding
     * for details on what should be specified for {@code mimeType} and {@code encoding}.
     *
     * @param mimeType the resource response's MIME type, for example {@code "text/html"}.
     * @param encoding the resource response's character encoding, for example {@code "utf-8"}.
     * @param statusCode the status code needs to be in the ranges [100, 299], [400, 599].
     * @param statusCode the status code needs to be in the ranges [100, 299], [400, 599].
     *                   Causing a redirect by specifying a 3xx code is not supported.
     *                   Causing a redirect by specifying a 3xx code is not supported.
     * @param reasonPhrase the phrase describing the status code, for example "OK". Must be
     * @param reasonPhrase the phrase describing the status code, for example "OK". Must be