summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorTao Bai <michaelbai@google.com>2014-07-16 13:54:15 -0700
committerTao Bai <michaelbai@google.com>2014-07-23 12:16:55 -0700
commit2871febb19c02c2d11c0aa3835e884361e60c580 (patch)
tree0e8c3c51c109f8c14614736d39f70fe4fd4d9e6c /api
parent0b633fc12188ac9a78c0cea9cacc8e90d08260dc (diff)
downloadframeworks_base-2871febb19c02c2d11c0aa3835e884361e60c580.zip
frameworks_base-2871febb19c02c2d11c0aa3835e884361e60c580.tar.gz
frameworks_base-2871febb19c02c2d11c0aa3835e884361e60c580.tar.bz2
WebView permission change
As requested by API council, the following were changed - Changed the PermissionRequest to abstract. - Used String for resources instead of long. - Also remove the WebView.preauthorizePermission() which we didn't think BUG: 15432556 Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
Diffstat (limited to 'api')
-rw-r--r--api/current.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index a49e0f7..8f446a0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36715,15 +36715,15 @@ package android.webkit {
method public boolean hasMimeType(java.lang.String);
}
- public abstract interface PermissionRequest {
+ public abstract class PermissionRequest {
+ ctor public 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_PROTECTED_MEDIA_ID = 8L; // 0x8L
- field public static final long RESOURCE_VIDEO_CAPTURE = 2L; // 0x2L
+ method public abstract java.lang.String[] getResources();
+ method public abstract void grant(java.lang.String[]);
+ field public static final java.lang.String RESOURCE_AUDIO_CAPTURE = "android.webkit.resource.AUDIO_CAPTURE";
+ field public static final java.lang.String RESOURCE_PROTECTED_MEDIA_ID = "android.webkit.resource.PROTECTED_MEDIA_ID";
+ field public static final java.lang.String RESOURCE_VIDEO_CAPTURE = "android.webkit.resource.VIDEO_CAPTURE";
}
public abstract interface PluginStub {
@@ -37102,7 +37102,6 @@ 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);