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

Commit b83d7427 authored by Ben Wiser's avatar Ben Wiser Committed by Automerger Merge Worker
Browse files

Merge "webkit: Add note about HttpAuthHandler being called from Ui" into... 

Merge "webkit: Add note about HttpAuthHandler being called from Ui" into udc-dev am: 0454dcac am: e4191ae9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22094726



Change-Id: I3e09d568c49d4c499778a01812d6be2d4904cd59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c3d65f4 e4191ae9

core/java/android/webkit/HttpAuthHandler.java

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ public class HttpAuthHandler extends Handler { 
     * are suitable for use. Credentials are not suitable if they have

     * previously been rejected by the server for the current request.

     *

     * <p class="note"><b>Note:</b> The host application must call this method

     * on the host application's UI Thread.

     *

     * @return whether the credentials are suitable for use

     * @see WebView#getHttpAuthUsernamePassword

     */
@@ -50,6 +53,9 @@ public class HttpAuthHandler extends Handler { 


    /**

     * Instructs the WebView to cancel the authentication request.

     *

     * <p class="note"><b>Note:</b> The host application must call this method

     * on the host application's UI Thread.

     */

    public void cancel() {

    }
@@ -58,6 +64,9 @@ public class HttpAuthHandler extends Handler { 
     * Instructs the WebView to proceed with the authentication with the given

     * credentials. Credentials for use with this method can be retrieved from

     * the WebView's store using {@link WebView#getHttpAuthUsernamePassword}.

     *

     * <p class="note"><b>Note:</b> The host application must call this method

     * on the host application's UI Thread.

     */

    public void proceed(String username, String password) {

    }

core/java/android/webkit/WebViewClient.java

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,9 @@ public class WebViewClient { 
     * {@link HttpAuthHandler} to set the WebView's response to the request.

     * The default behavior is to cancel the request.

     *

     * <p class="note"><b>Note:</b> The supplied HttpAuthHandler must be used on

     * the UI thread.

     *

     * @param view the WebView that is initiating the callback

     * @param handler the HttpAuthHandler used to set the WebView's response

     * @param host the host requiring authentication