diff options
| author | Marcin Kosiba <mkosiba@google.com> | 2014-09-05 15:13:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 15:13:40 +0000 |
| commit | 8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67 (patch) | |
| tree | eb913e3fbac089a39d8fa7675ad39a416dbda675 | |
| parent | c237555c6cb89c347acf13eba45b875946473501 (diff) | |
| parent | 100c20c900addf3c9458c697907b80eeeb860fd5 (diff) | |
| download | frameworks_base-8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67.zip frameworks_base-8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67.tar.gz frameworks_base-8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67.tar.bz2 | |
Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebResourceRequest.java | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 3642ff6..d7ddcf1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36539,6 +36539,7 @@ package android.webkit { method public abstract java.lang.String getMethod(); method public abstract java.util.Map<java.lang.String, java.lang.String> getRequestHeaders(); method public abstract android.net.Uri getUrl(); + method public abstract boolean hasGesture(); method public abstract boolean hasUserGestureInsecure(); method public abstract boolean isForMainFrame(); } diff --git a/core/java/android/webkit/WebResourceRequest.java b/core/java/android/webkit/WebResourceRequest.java index dc7c808..b46ac9a 100644 --- a/core/java/android/webkit/WebResourceRequest.java +++ b/core/java/android/webkit/WebResourceRequest.java @@ -41,7 +41,7 @@ public interface WebResourceRequest { boolean isForMainFrame(); /** - * Gets whether a gesture was associated with the request. + * Gets whether a gesture (such as a link click) was associated with the request. * <p> * <strong>IMPORTANT:</strong> * This should not be used to implement any form of security. It is possible for the content @@ -49,6 +49,11 @@ public interface WebResourceRequest { * * @return whether a gesture was associated with the request. */ + boolean hasGesture(); + + /* + * @removed + */ boolean hasUserGestureInsecure(); /** |