diff options
| author | 2020-07-28 15:05:17 +0000 | |
|---|---|---|
| committer | 2020-07-28 15:05:17 +0000 | |
| commit | b507bdd498fd4239793ac03875ee25bf76319ebb (patch) | |
| tree | 27c1a07230ddb89448f31b18304d8cb3b57a270e | |
| parent | 7583a24fd3e454f701d80facb1206be5fca42d3e (diff) | |
| parent | e5f8970c5d95cf6f155ac355ab30a92f57833ccd (diff) | |
Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8cd am: 262ad024bb am: e5f8970c5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373569
Change-Id: I6d9b4a1fcd41947cec687cafa27a833113c3ec3f
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClient.java | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f9a713ac7fcc..5eeab7225299 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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, diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 150fa88a36e3..7b6e1a370479 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -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. |