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

Commit 17c077ca authored by Nate Fischer's avatar Nate Fischer
Browse files

WebView: remove non-inclusive terminology from docs 

No change to logic, only docs. This removes non-inclusive terminology
("whitelist") from our API javadoc, with the exception of references to
setSafeBrowsingWhitelist() (which we plan to deprecate soon, in favor of
an inclusively named API).

This rephrases one paragraph to be a bit clearer as well.

Bug: 160928306
Test: m offline-sdk-docs -j4
Change-Id: If249be8a70b01c01390ebfeb418fd7c5e119f1f2
parent 9e9ce9f9

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,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.