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

Commit 563cd2d3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev

parents 7ccaa98f b5a9bf41

core/java/android/webkit/WebViewClient.java

+8 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ public class WebViewClient { 
     * other than the UI thread so clients should exercise caution

     * when accessing private data or the view system.

     *

     * <p>Note: when Safe Browsing is enabled, these URLs still undergo Safe Browsing checks. If

     * this is undesired, whitelist the URL with {@link WebView#setSafeBrowsingWhitelist} or ignore

     * the warning with {@link #onSafeBrowsingHit}.

     *

     * @param view The {@link android.webkit.WebView} that is requesting the

     *             resource.

     * @param url The raw url of the resource.
@@ -177,6 +181,10 @@ public class WebViewClient { 
     * other than the UI thread so clients should exercise caution

     * when accessing private data or the view system.

     *

     * <p>Note: when Safe Browsing is enabled, these URLs still undergo Safe Browsing checks. If

     * this is undesired, whitelist the URL with {@link WebView#setSafeBrowsingWhitelist} or ignore

     * the warning with {@link #onSafeBrowsingHit}.

     *

     * @param view The {@link android.webkit.WebView} that is requesting the

     *             resource.

     * @param request Object containing the details of the request.