summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorTao Bai <michaelbai@google.com>2014-04-30 13:31:34 -0700
committerTao Bai <michaelbai@google.com>2014-05-06 21:17:54 -0700
commitfa1fd2cb7d1bfcf17a02b926b3dfc2eefe5b9461 (patch)
tree4bb8fa8d96c056ade1e8f1e0ecb082ac757fbee1 /core/java/android/webkit/WebView.java
parent08fa40c5cb5229b7969b2a5146855a337870f45a (diff)
downloadframeworks_base-fa1fd2cb7d1bfcf17a02b926b3dfc2eefe5b9461.zip
frameworks_base-fa1fd2cb7d1bfcf17a02b926b3dfc2eefe5b9461.tar.gz
frameworks_base-fa1fd2cb7d1bfcf17a02b926b3dfc2eefe5b9461.tar.bz2
Public WebView permission API
BUG: 13699047 Change-Id: Ibcc8c0d4f1bba4365cb71c1991a0fcb1d7febb94
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-rw-r--r--core/java/android/webkit/WebView.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4b2b52c..91ca7b4 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1682,13 +1682,15 @@ public class WebView extends AbsoluteLayout
/**
* Preauthorize the given origin to access resources.
- * This authorization only valid for this WebView instance life cycle and
+ * The authorization only valid for this WebView instance's life cycle and
* will not retained.
*
+ * In the case that an origin has had resources preauthorized, calls to
+ * {@link WebChromeClient#onPermissionRequest(PermissionRequest)} will not be
+ * made for those resources from that origin.
+ *
* @param origin the origin authorized to access resources
* @param resources the resource authorized to be accessed by origin.
- *
- * @hide
*/
public void preauthorizePermission(Uri origin, long resources) {
checkThread();