diff options
| author | Nate Fischer <ntfschr@google.com> | 2017-09-14 01:49:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 01:49:06 +0000 |
| commit | 270bd52782e4f3128785bf36899291ef60e3bb45 (patch) | |
| tree | e20f8bea890219771809589a70c4bd398b050d3c /core/java/android/webkit/WebViewClient.java | |
| parent | a7c7899cf0b7eb1d45e6f95bf533fd019205f45c (diff) | |
| parent | ffbb5666d47b3823de5eefd22fff7563e13e1dfa (diff) | |
Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev am: 563cd2d3ca
am: ffbb5666d4
Change-Id: Ida56b201e8a00e0b968736ee29ee40b1d71b87d1
Diffstat (limited to 'core/java/android/webkit/WebViewClient.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClient.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index c403ad2b56c8..af7026d9f16a 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -153,6 +153,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. @@ -176,6 +180,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. |