Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I242a7436

Browse Source 
* changes:
  API changes to accompany NIO update 802921.
This commit is contained in:
Android (Google) Code Review
2009-10-16 16:43:00 -04:00
parent 07914840df 242a743608
commit 917d1b5065
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/current.xml
View File

@@ -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"