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

Merge "WebView: clarify shouldInterceptRequest docs" into pi-dev

Browse Source 
am: 0cf0d1368a

Change-Id: Ib556e836800e748cca781b2cf94280ac62e1d0bf
This commit is contained in:
Nate Fischer
2018-03-27 19:20:12 +00:00
committed by android-build-merger
parent 75347289a6 0cf0d1368a
commit a4d61f0342
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,14 @@ public class WebViewClient {
* will continue to load the resource as usual. Otherwise, the return
* response and data will be used.
*
* <p>This callback is invoked for a variety of URL schemes (e.g., {@code http(s):}, {@code
* data:}, {@code file:}, etc.), not only those schemes which send requests over the network.
* This is not called for {@code javascript:} URLs, {@code blob:} URLs, or for assets accessed
* via {@code file:///android_asset/} or {@code file:///android_res/} URLs.
*
* <p>In the case of redirects, this is only called for the initial resource URL, not any
* subsequent redirect URLs.
*
* <p class="note"><b>Note:</b> This method is called on a thread
* other than the UI thread so clients should exercise caution
* when accessing private data or the view system.
@@ -182,6 +190,14 @@ public class WebViewClient {
* will continue to load the resource as usual. Otherwise, the return
* response and data will be used.
*
* <p>This callback is invoked for a variety of URL schemes (e.g., {@code http(s):}, {@code
* data:}, {@code file:}, etc.), not only those schemes which send requests over the network.
* This is not called for {@code javascript:} URLs, {@code blob:} URLs, or for assets accessed
* via {@code file:///android_asset/} or {@code file:///android_res/} URLs.
*
* <p>In the case of redirects, this is only called for the initial resource URL, not any
* subsequent redirect URLs.
*
* <p class="note"><b>Note:</b> This method is called on a thread
* other than the UI thread so clients should exercise caution
* when accessing private data or the view system.