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

Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev

Browse Source 
am: 563cd2d3ca

Change-Id: I14aee03324a97717ebf109123c7a58649581ee11
This commit is contained in:
Nate Fischer
2017-09-13 20:35:03 +00:00
committed by android-build-merger
parent 05ebe674c1 563cd2d3ca
commit ffbb5666d4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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