summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorOleg Smirnov <oleg.smirnov@lge.com>2013-02-12 18:35:43 +0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-03-24 15:27:51 -0700
commitbf9ac818262c8af59cd7565cd353b47e1062b3f6 (patch)
tree86e7dfb33c235eca705bfceec1f1875be7468509 /api
parent6e0d2a6e0ce70073f977844200f477b9c552a11e (diff)
downloadframeworks_base-bf9ac818262c8af59cd7565cd353b47e1062b3f6.zip
frameworks_base-bf9ac818262c8af59cd7565cd353b47e1062b3f6.tar.gz
frameworks_base-bf9ac818262c8af59cd7565cd353b47e1062b3f6.tar.bz2
[HTML5] Implementation of WebSockets (framework).
Added binding to android port for Html5 WebSockets. Added external API for enabling\disabling from browser. SSL Web Sockets are not implemented in the current version. Change-Id: I8b7a42780410cb9f043e1f16570ea50db68e00ea
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index c57a541..0ff0fbc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27217,6 +27217,7 @@ package android.webkit {
method public synchronized int getTextZoom();
method public synchronized boolean getUseWideViewPort();
method public synchronized java.lang.String getUserAgentString();
+ method public synchronized boolean getWebSocketsEnabled();
method public void setAllowContentAccess(boolean);
method public void setAllowFileAccess(boolean);
method public abstract void setAllowFileAccessFromFileURLs(boolean);
@@ -27267,6 +27268,7 @@ package android.webkit {
method public synchronized void setTextZoom(int);
method public synchronized void setUseWideViewPort(boolean);
method public synchronized void setUserAgentString(java.lang.String);
+ method public synchronized void setWebSocketsEnabled(boolean);
method public synchronized boolean supportMultipleWindows();
method public boolean supportZoom();
field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1
@@ -41332,8 +41334,8 @@ package java.util.zip {
public class ZipFile {
ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
- ctor public ZipFile(java.io.File, int) throws java.io.IOException;
ctor public ZipFile(java.lang.String) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, int) throws java.io.IOException;
method public void close() throws java.io.IOException;
method public java.util.Enumeration<? extends java.util.zip.ZipEntry> entries();
method public java.util.zip.ZipEntry getEntry(java.lang.String);