diff options
author | Tao Bai <michaelbai@google.com> | 2014-05-07 06:52:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 06:52:31 +0000 |
commit | cd2b93260d45e1363d82b93c89f73d45e41b7dc3 (patch) | |
tree | 96c4ff8be81632577ad48d88d2d135968fe53bee /api | |
parent | 353bda0985af2c250f3a9f1a5e4eae279d1dea0d (diff) | |
parent | fa1fd2cb7d1bfcf17a02b926b3dfc2eefe5b9461 (diff) | |
download | frameworks_base-cd2b93260d45e1363d82b93c89f73d45e41b7dc3.zip frameworks_base-cd2b93260d45e1363d82b93c89f73d45e41b7dc3.tar.gz frameworks_base-cd2b93260d45e1363d82b93c89f73d45e41b7dc3.tar.bz2 |
am 1091e2c9: Public WebView permission API
* commit '1091e2c9f7f2ee127cf5fc29285c7a7b6cc830f8':
Public WebView permission API
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 51e2169..2f6edc1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33262,6 +33262,16 @@ package android.webkit { method public boolean hasMimeType(java.lang.String); } + public abstract interface PermissionRequest { + method public abstract void deny(); + method public abstract android.net.Uri getOrigin(); + method public abstract long getResources(); + method public abstract void grant(long); + field public static final long RESOURCE_AUDIO_CAPTURE = 4L; // 0x4L + field public static final long RESOURCE_GEOLOCATION = 1L; // 0x1L + field public static final long RESOURCE_VIDEO_CAPTURE = 2L; // 0x2L + } + public abstract interface PluginStub { method public abstract android.view.View getEmbeddedView(int, android.content.Context); method public abstract android.view.View getFullScreenView(int, android.content.Context); @@ -33321,6 +33331,8 @@ package android.webkit { method public boolean onJsConfirm(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult); method public boolean onJsPrompt(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String, android.webkit.JsPromptResult); method public deprecated boolean onJsTimeout(); + method public void onPermissionRequest(android.webkit.PermissionRequest); + method public void onPermissionRequestCanceled(android.webkit.PermissionRequest); method public void onProgressChanged(android.webkit.WebView, int); method public deprecated void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater); method public void onReceivedIcon(android.webkit.WebView, android.graphics.Bitmap); @@ -33608,6 +33620,7 @@ package android.webkit { method public boolean pageUp(boolean); method public void pauseTimers(); method public void postUrl(java.lang.String, byte[]); + method public void preauthorizePermission(android.net.Uri, long); method public void reload(); method public void removeJavascriptInterface(java.lang.String); method public void requestFocusNodeHref(android.os.Message); |