summaryrefslogtreecommitdiffstats
path: root/api/current.xml
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2009-10-15 19:24:17 -0700
committerJesse Wilson <jessewilson@google.com>2009-10-15 19:24:17 -0700
commit242a743608384d26b3012629c5cbeff1dc715891 (patch)
treeb0f29b767046fd063fa0998da53d281cef95c921 /api/current.xml
parent94bda52a516a838d3551f31f7b776ca0efaddad2 (diff)
downloadframeworks_base-242a743608384d26b3012629c5cbeff1dc715891.zip
frameworks_base-242a743608384d26b3012629c5cbeff1dc715891.tar.gz
frameworks_base-242a743608384d26b3012629c5cbeff1dc715891.tar.bz2
API changes to accompany NIO update 802921.
See https://android-git.corp.google.com/g/30216
Diffstat (limited to 'api/current.xml')
-rw-r--r--api/current.xml18
1 files changed, 5 insertions, 13 deletions
diff --git a/api/current.xml b/api/current.xml
index a175769..2e8ca9f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -207038,7 +207038,7 @@
</parameter>
<parameter name="offset" type="int">
</parameter>
-<parameter name="length" type="int">
+<parameter name="count" type="int">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
@@ -208174,7 +208174,7 @@
</parameter>
<parameter name="offset" type="int">
</parameter>
-<parameter name="count" type="int">
+<parameter name="length" type="int">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
@@ -242856,7 +242856,7 @@
return="void"
abstract="false"
native="false"
- synchronized="true"
+ synchronized="false"
static="false"
final="true"
deprecated="not deprecated"
@@ -243089,8 +243089,6 @@
</parameter>
<parameter name="aliases" type="java.lang.String[]">
</parameter>
-<exception name="IllegalCharsetNameException" type="java.nio.charset.IllegalCharsetNameException">
-</exception>
</constructor>
<method name="aliases"
return="java.util.Set&lt;java.lang.String&gt;"
@@ -243203,7 +243201,7 @@
return="java.nio.ByteBuffer"
abstract="false"
native="false"
- synchronized="true"
+ synchronized="false"
static="false"
final="true"
deprecated="not deprecated"
@@ -243250,10 +243248,6 @@
>
<parameter name="charsetName" type="java.lang.String">
</parameter>
-<exception name="IllegalCharsetNameException" type="java.nio.charset.IllegalCharsetNameException">
-</exception>
-<exception name="UnsupportedCharsetException" type="java.nio.charset.UnsupportedCharsetException">
-</exception>
</method>
<method name="hashCode"
return="int"
@@ -243281,7 +243275,7 @@
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="true"
final="false"
deprecated="not deprecated"
@@ -243289,8 +243283,6 @@
>
<parameter name="charsetName" type="java.lang.String">
</parameter>
-<exception name="IllegalCharsetNameException" type="java.nio.charset.IllegalCharsetNameException">
-</exception>
</method>
<method name="name"
return="java.lang.String"