From 6de753bffe47e796942272692869992f62f8f0ab Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jessewilson@google.com>
Date: Thu, 3 Sep 2009 14:03:18 -0700
Subject: [PATCH] do not merge: update API for Josh's optimizations for Eclair

---
 api/current.xml   | 20 ++++++++++----------
 preloaded-classes | 28 ++++++++++++++++++----------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 7bb99e482bd94..7ed9a156bc756 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -272297,7 +272297,7 @@
  return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;"
  abstract="false"
  native="false"
- synchronized="false"
+ synchronized="true"
  static="false"
  final="false"
  deprecated="not deprecated"
@@ -272332,7 +272332,7 @@
  return="java.util.Set&lt;K&gt;"
  abstract="false"
  native="false"
- synchronized="false"
+ synchronized="true"
  static="false"
  final="false"
  deprecated="not deprecated"
@@ -272417,7 +272417,7 @@
  return="java.util.Collection&lt;V&gt;"
  abstract="false"
  native="false"
- synchronized="false"
+ synchronized="true"
  static="false"
  final="false"
  deprecated="not deprecated"
@@ -272792,7 +272792,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="s" type="int">
+<parameter name="initialCapacity" type="int">
 </parameter>
 </constructor>
 <constructor name="LinkedHashMap"
@@ -272802,9 +272802,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="s" type="int">
+<parameter name="initialCapacity" type="int">
 </parameter>
-<parameter name="lf" type="float">
+<parameter name="loadFactor" type="float">
 </parameter>
 </constructor>
 <constructor name="LinkedHashMap"
@@ -272814,11 +272814,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="s" type="int">
+<parameter name="initialCapacity" type="int">
 </parameter>
-<parameter name="lf" type="float">
+<parameter name="loadFactor" type="float">
 </parameter>
-<parameter name="order" type="boolean">
+<parameter name="accessOrder" type="boolean">
 </parameter>
 </constructor>
 <constructor name="LinkedHashMap"
@@ -272828,7 +272828,7 @@
  deprecated="not deprecated"
  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>
 </constructor>
 <method name="removeEldestEntry"
diff --git a/preloaded-classes b/preloaded-classes
index 6eb3cf2f09238..3da4797d8942f 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -843,24 +843,32 @@ java.util.EventObject
 java.util.Formatter
 java.util.GregorianCalendar
 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$HashMapEntrySet
+java.util.HashMap$EntrySet
+java.util.HashMap$HashIterator
+java.util.HashMap$HashMapEntry
 java.util.HashMap$KeyIterator
+java.util.HashMap$KeySet
 java.util.HashMap$ValueIterator
+java.util.HashMap$Values
 java.util.HashSet
 java.util.Hashtable
-java.util.Hashtable$6
-java.util.Hashtable$6$1
-java.util.Hashtable$Entry
-java.util.Hashtable$HashEnumIterator
+java.util.Hashtable$EntryIterator
+java.util.Hashtable$EntrySet
 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.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$Link
 java.util.List