diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-12 21:51:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-12 21:51:37 +0000 |
| commit | 563cd2d3ca5e08eea47dad9de080f77a52f39dd1 (patch) | |
| tree | 9ac33fa691b7fe769b38af19993e129f2e4e52f3 /core/java/android/webkit | |
| parent | 7ccaa98fbb7e4b2381e630698090fb1bac31541a (diff) | |
| parent | b5a9bf41b1900d887fc7cc61bfbe73c3f2a1718c (diff) | |
Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev
Diffstat (limited to 'core/java/android/webkit')
| -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 e7e539c7f01c..cbe75c405fe4 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -154,6 +154,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. @@ -177,6 +181,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. |