summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-12-13 14:30:39 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-13 14:30:39 -0800
commitffdd591a829af7fddd36a7b80d2a3b8188c871a6 (patch)
treef590d30707383b3982f93cc18f306dc8e6fcbd62
parent7b33148251e10c45cea6f70e9882e9324b98c121 (diff)
parent502893cdd390b8c4827d4dd4a6aeb8366adcb777 (diff)
downloadframeworks_base-ffdd591a829af7fddd36a7b80d2a3b8188c871a6.zip
frameworks_base-ffdd591a829af7fddd36a7b80d2a3b8188c871a6.tar.gz
frameworks_base-ffdd591a829af7fddd36a7b80d2a3b8188c871a6.tar.bz2
Merge "Update API for CopyOnWriteArrayList "synchronized" changes"
-rw-r--r--api/current.xml74
1 files changed, 37 insertions, 37 deletions
diff --git a/api/current.xml b/api/current.xml
index b8a5946..f060182 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -251058,7 +251058,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
</parameter>
</method>
</interface>
@@ -286492,11 +286492,11 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="buf" type="byte[]">
+<parameter name="data" type="byte[]">
</parameter>
-<parameter name="anOffset" type="int">
+<parameter name="offset" type="int">
</parameter>
-<parameter name="aLength" type="int">
+<parameter name="byteCount" type="int">
</parameter>
</method>
<method name="setData"
@@ -286522,7 +286522,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="len" type="int">
+<parameter name="length" type="int">
</parameter>
</method>
<method name="setPort"
@@ -295295,7 +295295,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="chseq" type="java.lang.CharSequence">
+<parameter name="cs" type="java.lang.CharSequence">
</parameter>
<parameter name="start" type="int">
</parameter>
@@ -353803,7 +353803,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
+<parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<constructor name="CopyOnWriteArrayList"
@@ -353820,7 +353820,7 @@
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -353833,7 +353833,7 @@
return="void"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -353848,20 +353848,20 @@
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
+<parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</method>
<method name="addAll"
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -353869,40 +353869,40 @@
>
<parameter name="index" type="int">
</parameter>
-<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
+<parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</method>
<method name="addAllAbsent"
return="int"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
+<parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</method>
<method name="addIfAbsent"
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
-<parameter name="e" type="E">
+<parameter name="object" type="E">
</parameter>
</method>
<method name="clear"
return="void"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -353943,7 +353943,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;?&gt;">
+<parameter name="collection" type="java.util.Collection&lt;?&gt;">
</parameter>
</method>
<method name="get"
@@ -353969,9 +353969,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="e" type="E">
+<parameter name="object" type="E">
</parameter>
-<parameter name="index" type="int">
+<parameter name="from" type="int">
</parameter>
</method>
<method name="indexOf"
@@ -353984,7 +353984,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="o" type="java.lang.Object">
+<parameter name="object" type="java.lang.Object">
</parameter>
</method>
<method name="isEmpty"
@@ -354019,9 +354019,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="e" type="E">
+<parameter name="object" type="E">
</parameter>
-<parameter name="index" type="int">
+<parameter name="to" type="int">
</parameter>
</method>
<method name="lastIndexOf"
@@ -354034,7 +354034,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="o" type="java.lang.Object">
+<parameter name="object" type="java.lang.Object">
</parameter>
</method>
<method name="listIterator"
@@ -354047,6 +354047,8 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="index" type="int">
+</parameter>
</method>
<method name="listIterator"
return="java.util.ListIterator&lt;E&gt;"
@@ -354058,14 +354060,12 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="index" type="int">
-</parameter>
</method>
<method name="remove"
return="E"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -354078,7 +354078,7 @@
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -354091,33 +354091,33 @@
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;?&gt;">
+<parameter name="collection" type="java.util.Collection&lt;?&gt;">
</parameter>
</method>
<method name="retainAll"
return="boolean"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
-<parameter name="c" type="java.util.Collection&lt;?&gt;">
+<parameter name="collection" type="java.util.Collection&lt;?&gt;">
</parameter>
</method>
<method name="set"
return="E"
abstract="false"
native="false"
- synchronized="false"
+ synchronized="true"
static="false"
final="false"
deprecated="not deprecated"
@@ -354149,9 +354149,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="fromIndex" type="int">
+<parameter name="from" type="int">
</parameter>
-<parameter name="toIndex" type="int">
+<parameter name="to" type="int">
</parameter>
</method>
<method name="toArray"
@@ -354175,7 +354175,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="a" type="T[]">
+<parameter name="contents" type="T[]">
</parameter>
</method>
</class>