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

Commit e5f8970c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8 am: 262ad024 

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

Change-Id: Id982ac47849fc9c4865a3b93c85f12e71a5bbf3f
parents 41d7c541 262ad024

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ public class WebView extends AbsoluteLayout 
     *

     * @param hosts the list of hosts

     * @param callback will be called with {@code true} if hosts are successfully added to the

     * whitelist. It will be called with {@code false} if any hosts are malformed. The callback

     * allowlist. It will be called with {@code false} if any hosts are malformed. The callback

     * will be run on the UI thread

     */

    public static void setSafeBrowsingWhitelist(@NonNull List<String> hosts,

core/java/android/webkit/WebViewClient.java

+6 −4
Original line number Diff line number Diff line
@@ -173,8 +173,9 @@ public class WebViewClient { 
     * when accessing private data or the view system.

     *

     * <p class="note"><b>Note:</b> 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}.

     * Browsing checks. If this is undesired, you can use {@link WebView#setSafeBrowsingWhitelist}

     * to skip Safe Browsing checks for that host or dismiss the warning in {@link

     * #onSafeBrowsingHit} by calling {@link SafeBrowsingResponse#proceed}.

     *

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

     *             resource.
@@ -211,8 +212,9 @@ public class WebViewClient { 
     * when accessing private data or the view system.

     *

     * <p class="note"><b>Note:</b> 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}.

     * Browsing checks. If this is undesired, you can use {@link WebView#setSafeBrowsingWhitelist}

     * to skip Safe Browsing checks for that host or dismiss the warning in {@link

     * #onSafeBrowsingHit} by calling {@link SafeBrowsingResponse#proceed}.

     *

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

     *             resource.