Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8cd am: 262ad024bb am: e5f8970c5d

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

Change-Id: I6d9b4a1fcd41947cec687cafa27a833113c3ec3f
This commit is contained in:
Treehugger Robot
2020-07-28 15:05:17 +00:00
committed by Automerger Merge Worker
parent 7583a24fd3 e5f8970c5d
commit b507bdd498
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebView.java
View File

@@ -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,

10
core/java/android/webkit/WebViewClient.java
View File

@@ -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.