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

Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-31 02:28:11 +00:00
committed by Android (Google) Code Review
parent ca468f1983 fbebfa9d53
commit 0899236129
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1656,14 +1656,13 @@ public class WebView extends AbsoluteLayout
* Each rule should take one of these:
* <table>
* <tr><th> Rule </th> <th> Example </th> <th> Matches Subdomain</th> </tr>
* <tr><th> HOSTNAME </th> <th> example.com </th> <th> Yes </th> </tr>
* <tr><th>.HOSTNAME</th> <th> .example.com </th> <th> No </th> </tr>
* <tr><th> IPV4_LITERAL </th> <th> 192.168.1.1 </th> <th> No </th></tr>
* <tr><th> IPV6_LITERAL_WITH_BRACKETS</th><th>[10:20:30:40:50:60:70:80]</th><th>No</th></tr>
* <tr><td> HOSTNAME </td> <td> example.com </td> <td> Yes </td> </tr>
* <tr><td> .HOSTNAME </td> <td> .example.com </td> <td> No </td> </tr>
* <tr><td> IPV4_LITERAL </td> <td> 192.168.1.1 </td> <td> No </td></tr>
* <tr><td> IPV6_LITERAL_WITH_BRACKETS </td><td>[10:20:30:40:50:60:70:80]</td><td>No</td></tr>
* </table>
* <p>
* All other rules, including wildcards, are invalid.
* <p>
*
* @param urls the list of URLs
* @param callback will be called with true if URLs are successfully added to the whitelist.