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

am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair

Browse Source 
Merge commit '6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp

* commit '6de753bffe47e796942272692869992f62f8f0ab':
  do not merge: update API for Josh's optimizations for Eclair
This commit is contained in:
Jesse Wilson
2009-09-03 17:50:58 -07:00
committed by Android Git Automerger
parent da32be5e06 6de753bffe
commit 6ffca3534c
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/current.xml
View File

@@ -272297,7 +272297,7 @@
return="java.util.Set<java.util.Map.Entry<K, V>>" return="java.util.Set<java.util.Map.Entry<K, V>>"
abstract="false" abstract="false"
native="false" native="false"
synchronized="false" synchronized="true"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="not deprecated"
@@ -272332,7 +272332,7 @@
return="java.util.Set<K>" return="java.util.Set<K>"
abstract="false" abstract="false"
native="false" native="false"
synchronized="false" synchronized="true"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="not deprecated"
@@ -272417,7 +272417,7 @@
return="java.util.Collection<V>" return="java.util.Collection<V>"
abstract="false" abstract="false"
native="false" native="false"
synchronized="false" synchronized="true"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="not deprecated"
@@ -272792,7 +272792,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="s" type="int"> <parameter name="initialCapacity" type="int">
</parameter> </parameter>
</constructor> </constructor>
<constructor name="LinkedHashMap" <constructor name="LinkedHashMap"
@@ -272802,9 +272802,9 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="s" type="int"> <parameter name="initialCapacity" type="int">
</parameter> </parameter>
<parameter name="lf" type="float"> <parameter name="loadFactor" type="float">
</parameter> </parameter>
</constructor> </constructor>
<constructor name="LinkedHashMap" <constructor name="LinkedHashMap"
@@ -272814,11 +272814,11 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="s" type="int"> <parameter name="initialCapacity" type="int">
</parameter> </parameter>
<parameter name="lf" type="float"> <parameter name="loadFactor" type="float">
</parameter> </parameter>
<parameter name="order" type="boolean"> <parameter name="accessOrder" type="boolean">
</parameter> </parameter>
</constructor> </constructor>
<constructor name="LinkedHashMap" <constructor name="LinkedHashMap"
@@ -272828,7 +272828,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="m" type="java.util.Map&lt;? extends K, ? extends V&gt;"> <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
</parameter> </parameter>
</constructor> </constructor>
<method name="removeEldestEntry" <method name="removeEldestEntry"

28
preloaded-classes
View File

@@ -843,24 +843,32 @@ java.util.EventObject
java.util.Formatter java.util.Formatter
java.util.GregorianCalendar java.util.GregorianCalendar
java.util.HashMap java.util.HashMap
java.util.HashMap$1
java.util.HashMap$2
java.util.HashMap$AbstractMapIterator
java.util.HashMap$Entry
java.util.HashMap$EntryIterator java.util.HashMap$EntryIterator
java.util.HashMap$HashMapEntrySet java.util.HashMap$EntrySet
java.util.HashMap$HashIterator
java.util.HashMap$HashMapEntry
java.util.HashMap$KeyIterator java.util.HashMap$KeyIterator
java.util.HashMap$KeySet
java.util.HashMap$ValueIterator java.util.HashMap$ValueIterator
java.util.HashMap$Values
java.util.HashSet java.util.HashSet
java.util.Hashtable java.util.Hashtable
java.util.Hashtable$6 java.util.Hashtable$EntryIterator
java.util.Hashtable$6$1 java.util.Hashtable$EntrySet
java.util.Hashtable$Entry
java.util.Hashtable$HashEnumIterator
java.util.Hashtable$HashIterator java.util.Hashtable$HashIterator
java.util.Hashtable$HashtableEntry
java.util.Hashtable$KeyEnumeration
java.util.Hashtable$KeyIterator
java.util.Hashtable$KeySet
java.util.Hashtable$ValueEnumeration
java.util.Hashtable$ValueIterator
java.util.Hashtable$Values
java.util.IdentityHashMap java.util.IdentityHashMap
java.util.LinkedHashMap java.util.LinkedHashMap
java.util.LinkedHashMap$LinkedHashMapEntry java.util.LinkedHashMap$EntryIterator
java.util.LinkedHashMap$KeyIterator
java.util.LinkedHashMap$LinkedEntry
java.util.LinkedHashMap$ValueIterator
java.util.LinkedList java.util.LinkedList
java.util.LinkedList$Link java.util.LinkedList$Link
java.util.List java.util.List